---

yaml --- r: 330451 b: refs/heads/master c: 82bd550 h: refs/heads/master i: 330449: a8ff7a4 330447: e7ff0b6 v: v3
git-mirror · Sep 26, 2012 · 2440950 · 2440950
1 parent 8ce203f
commit 2440950
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e5965bf1f018cc30a4659fa3f1a40146e4276f6
+refs/heads/master: 82bd5508b4080e851ac1a9b62bed6d727b1b4a84
diff --git a/trunk/mm/slob.c b/trunk/mm/slob.c
@@ -482,7 +482,7 @@ void *__kmalloc_track_caller(size_t size, gfp_t gfp, unsigned long caller)
 }
 
 #ifdef CONFIG_NUMA
-void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
+void *__kmalloc_node_track_caller(size_t size, gfp_t gfp,
 					int node, unsigned long caller)
 {
 	return __do_kmalloc_node(size, gfp, node, caller);