projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
82bd550
)
Revert "mm/slab: Fix kmem_cache_alloc_node_trace() declaration"
author
Pekka Enberg
<penberg@kernel.org>
Sat, 29 Sep 2012 07:00:59 +0000
(10:00 +0300)
committer
Pekka Enberg
<penberg@kernel.org>
Sat, 29 Sep 2012 07:00:59 +0000
(10:00 +0300)
This reverts commit
1e5965bf1f018cc30a4659fa3f1a40146e4276f6
. Ezequiel
Garcia has a better fix.
mm/slab.c
patch
|
blob
|
history
diff --git
a/mm/slab.c
b/mm/slab.c
index 3409eada242d832d9d7afdee2c8d96cb3b2937d2..ca3849fe0584e54638bb3b2dac2ec54dde97f0b5 100644
(file)
--- 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
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,
gfp_t flags,
- int nodeid)
+ int nodeid,
+ size_t size)
{
void *ret;
{
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;
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, nod
e);
+ return kmem_cache_alloc_node_trace(
cachep, flags, node, siz
e);
}
#if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_TRACING)
}
#if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_TRACING)