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

Commit c0b24b51 authored by Pekka Enberg's avatar Pekka Enberg
Browse files

Revert "mm/slab: Fix kmem_cache_alloc_node_trace() declaration" 

This reverts commit 1e5965bf. Ezequiel
Garcia has a better fix.
parent 82bd5508

mm/slab.c

+4 −4
Original line number Diff line number Diff line
@@ -3862,10 +3862,10 @@ void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t flags, int nodeid) 
EXPORT_SYMBOL(kmem_cache_alloc_node);



#ifdef CONFIG_TRACING

void *kmem_cache_alloc_node_trace(size_t size,

				  struct kmem_cache *cachep,

void *kmem_cache_alloc_node_trace(struct kmem_cache *cachep,

				  gfp_t flags,

				  int nodeid)

				  int nodeid,

				  size_t size)

{

	void *ret;
@@ -3887,7 +3887,7 @@ __do_kmalloc_node(size_t size, gfp_t flags, int node, unsigned long caller) 
	cachep = kmem_find_general_cachep(size, flags);

	if (unlikely(ZERO_OR_NULL_PTR(cachep)))

		return cachep;

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

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

}



#if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_TRACING)