Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dffa3f98 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Pekka Enberg
Browse files

mm/slab: Fix kmem_cache_alloc_node_trace() declaration 



This bug was introduced in commit 4052147c ("mm, slab: Match SLAB and
SLUB kmem_cache_alloc_xxx_trace() prototype").

Cc: David Rientjes <rientjes@google.com>
Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Signed-off-by: default avatarEzequiel Garcia <elezegarcia@gmail.com>
Signed-off-by: default avatarPekka Enberg <penberg@kernel.org>
parent c0b24b51

include/linux/slab_def.h

+7 −7
Original line number Diff line number Diff line
@@ -159,16 +159,16 @@ extern void *__kmalloc_node(size_t size, gfp_t flags, int node); 
extern void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);



#ifdef CONFIG_TRACING

extern void *kmem_cache_alloc_node_trace(size_t size,

					 struct kmem_cache *cachep,

extern void *kmem_cache_alloc_node_trace(struct kmem_cache *cachep,

					 gfp_t flags,

					 int nodeid);

					 int nodeid,

					 size_t size);

#else

static __always_inline void *

kmem_cache_alloc_node_trace(size_t size,

			    struct kmem_cache *cachep,

kmem_cache_alloc_node_trace(struct kmem_cache *cachep,

			    gfp_t flags,

			    int nodeid)

			    int nodeid,

			    size_t size)

{

	return kmem_cache_alloc_node(cachep, flags, nodeid);

}
@@ -200,7 +200,7 @@ found: 
#endif

			cachep = malloc_sizes[i].cs_cachep;



		return kmem_cache_alloc_node_trace(size, cachep, flags, node);

		return kmem_cache_alloc_node_trace(cachep, flags, node, size);

	}

	return __kmalloc_node(size, flags, node);

}