diff options
| author | Pekka Enberg <penberg@kernel.org> | 2012-09-29 09:00:59 +0200 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2012-09-29 09:00:59 +0200 |
| commit | c0b24b5100cb96cba71666953a8619a616684967 (patch) | |
| tree | 127db9ba0b1c1dac3d6925ee37b23058b0de43ac /mm/slab.c | |
| parent | mm, slob: fix build breakage in __kmalloc_node_track_caller (diff) | |
| download | linux-c0b24b5100cb96cba71666953a8619a616684967.tar.xz linux-c0b24b5100cb96cba71666953a8619a616684967.zip | |
Revert "mm/slab: Fix kmem_cache_alloc_node_trace() declaration"
This reverts commit 1e5965bf1f018cc30a4659fa3f1a40146e4276f6. Ezequiel
Garcia has a better fix.
Diffstat (limited to 'mm/slab.c')
| -rw-r--r-- | mm/slab.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mm/slab.c b/mm/slab.c index 3409eada242d..ca3849fe0584 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -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) |