mm-remove-__krealloc.patch removed from -mm tree
The patch titled
Subject: mm: remove __krealloc
has been removed from the -mm tree. Its filename was
mm-remove-__krealloc.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Florian Westphal <[email protected]>
Subject: mm: remove __krealloc
Since 5.5-rc1 the last user of this function is gone, so remove the functionality.
See commit2ad9d7747c10 ("netfilter: conntrack: free extension area immediately") for details.
Signed-off-by Florian Westphal <[email protected]>
Acked-by Andrew Morton <[email protected]>
Acked-by David Rientjes <[email protected]>
Reviewed-by David Hildenbrand <[email protected]>
Cc Christoph Lameter <[email protected]>
Cc Pekka Enberg <[email protected]>
Cc Joonsoo Kim <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
include/linux/slab.h | 1 - mm/slab_common.c | 22 ---------------------- scripts/coccinelle/free/devm_free.cocci | 4 ---- 3 files changed, 27 deletions(-)
include/linux/slab.h renamed from include/linux/slab.h~mm-remove-__krealloc +0 -1
@@ -184,7 +184,6 @@ void memcg_deactivate_kmem_caches(struct/* * Common kmalloc functions provided by all allocators */ -void *__must_check __krealloc (const void *,size_t ,gfp_t );void *__must_check krealloc (const void *,size_t ,gfp_t );void kfree (const void *);void kzfree (const void *);
mm/slab_common.c renamed from mm/slab_common.c~mm-remove-__krealloc +0 -22
@@ -1677,28 +1677,6 @@ static __always_inline void *__do_kreall }/** -* __krealloc - like krealloc() but don't free @p. -* @p: object to reallocate memory for. -* @new_size: how many bytes of memory are required. -* @flags: the type of memory to allocate. -* -* This function is like krealloc() except it never frees the originally -* allocated buffer. Use this if you don't want to free the buffer immediately -* like, for example, with RCU. -* -* Return: pointer to the allocated memory or %NULL in case of error -*/ -void *__krealloc (const void *p,size_t new_size,gfp_t flags) -{ -if (unlikely (!new_size)) -return ZERO_SIZE_PTR ; - -return __do_krealloc (p, new_size, flags); - -} -EXPORT_SYMBOL (__krealloc); - -/** * krealloc - reallocate memory. The contents will remain unchanged. * @p: object to reallocate memory for. * @new_size: how many bytes of memory are required.
scripts/coccinelle/free/devm_free.cocci renamed from scripts/coccinelle/free/devm_free.cocci~mm-remove-__krealloc +0 -4
@@ -91,8 +91,6 @@ position p; | kzfree@p(x) | - __krealloc@p(x, ...) -| krealloc@p(x, ...) | free_pages@p(x, ...)
@@ -116,8 +114,6 @@ position p != safe.p; | * kzfree@p(x) | -* __krealloc@p(x, ...) -| * krealloc@p(x, ...) | * free_pages@p(x, ...)
_
Patches currently in -mm which might be from [email protected] are