diff options
Diffstat (limited to 'mm/slab.c')
-rw-r--r-- | mm/slab.c | 46 |
1 files changed, 0 insertions, 46 deletions
@@ -3726,52 +3726,6 @@ EXPORT_SYMBOL(__kmalloc); | |||
3726 | #endif | 3726 | #endif |
3727 | 3727 | ||
3728 | /** | 3728 | /** |
3729 | * krealloc - reallocate memory. The contents will remain unchanged. | ||
3730 | * @p: object to reallocate memory for. | ||
3731 | * @new_size: how many bytes of memory are required. | ||
3732 | * @flags: the type of memory to allocate. | ||
3733 | * | ||
3734 | * The contents of the object pointed to are preserved up to the | ||
3735 | * lesser of the new and old sizes. If @p is %NULL, krealloc() | ||
3736 | * behaves exactly like kmalloc(). If @size is 0 and @p is not a | ||
3737 | * %NULL pointer, the object pointed to is freed. | ||
3738 | */ | ||
3739 | void *krealloc(const void *p, size_t new_size, gfp_t flags) | ||
3740 | { | ||
3741 | struct kmem_cache *cache, *new_cache; | ||
3742 | void *ret; | ||
3743 | |||
3744 | if (unlikely(!p)) | ||
3745 | return kmalloc_track_caller(new_size, flags); | ||
3746 | |||
3747 | if (unlikely(!new_size)) { | ||
3748 | kfree(p); | ||
3749 | return NULL; | ||
3750 | } | ||
3751 | |||
3752 | cache = virt_to_cache(p); | ||
3753 | new_cache = __find_general_cachep(new_size, flags); | ||
3754 | |||
3755 | /* | ||
3756 | * If new size fits in the current cache, bail out. | ||
3757 | */ | ||
3758 | if (likely(cache == new_cache)) | ||
3759 | return (void *)p; | ||
3760 | |||
3761 | /* | ||
3762 | * We are on the slow-path here so do not use __cache_alloc | ||
3763 | * because it bloats kernel text. | ||
3764 | */ | ||
3765 | ret = kmalloc_track_caller(new_size, flags); | ||
3766 | if (ret) { | ||
3767 | memcpy(ret, p, min(new_size, ksize(p))); | ||
3768 | kfree(p); | ||
3769 | } | ||
3770 | return ret; | ||
3771 | } | ||
3772 | EXPORT_SYMBOL(krealloc); | ||
3773 | |||
3774 | /** | ||
3775 | * kmem_cache_free - Deallocate an object | 3729 | * kmem_cache_free - Deallocate an object |
3776 | * @cachep: The cache the allocation was from. | 3730 | * @cachep: The cache the allocation was from. |
3777 | * @objp: The previously allocated object. | 3731 | * @objp: The previously allocated object. |