diff options
author | Pekka Enberg <penberg@kernel.org> | 2012-09-29 03:00:59 -0400 |
---|---|---|
committer | Pekka Enberg <penberg@kernel.org> | 2012-09-29 03:00:59 -0400 |
commit | c0b24b5100cb96cba71666953a8619a616684967 (patch) | |
tree | 127db9ba0b1c1dac3d6925ee37b23058b0de43ac /mm | |
parent | 82bd5508b4080e851ac1a9b62bed6d727b1b4a84 (diff) |
Revert "mm/slab: Fix kmem_cache_alloc_node_trace() declaration"
This reverts commit 1e5965bf1f018cc30a4659fa3f1a40146e4276f6. Ezequiel
Garcia has a better fix.
Diffstat (limited to 'mm')
-rw-r--r-- | mm/slab.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -3862,10 +3862,10 @@ void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t flags, int nodeid) | |||
3862 | EXPORT_SYMBOL(kmem_cache_alloc_node); | 3862 | EXPORT_SYMBOL(kmem_cache_alloc_node); |
3863 | 3863 | ||
3864 | #ifdef CONFIG_TRACING | 3864 | #ifdef CONFIG_TRACING |
3865 | void *kmem_cache_alloc_node_trace(size_t size, | 3865 | void *kmem_cache_alloc_node_trace(struct kmem_cache *cachep, |
3866 | struct kmem_cache *cachep, | ||
3867 | gfp_t flags, | 3866 | gfp_t flags, |
3868 | int nodeid) | 3867 | int nodeid, |
3868 | size_t size) | ||
3869 | { | 3869 | { |
3870 | void *ret; | 3870 | void *ret; |
3871 | 3871 | ||
@@ -3887,7 +3887,7 @@ __do_kmalloc_node(size_t size, gfp_t flags, int node, unsigned long caller) | |||
3887 | cachep = kmem_find_general_cachep(size, flags); | 3887 | cachep = kmem_find_general_cachep(size, flags); |
3888 | if (unlikely(ZERO_OR_NULL_PTR(cachep))) | 3888 | if (unlikely(ZERO_OR_NULL_PTR(cachep))) |
3889 | return cachep; | 3889 | return cachep; |
3890 | return kmem_cache_alloc_node_trace(size, cachep, flags, node); | 3890 | return kmem_cache_alloc_node_trace(cachep, flags, node, size); |
3891 | } | 3891 | } |
3892 | 3892 | ||
3893 | #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_TRACING) | 3893 | #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_TRACING) |