---

yaml --- r: 215959 b: refs/heads/master c: 92a5bbc h: refs/heads/master i: 215957: 9d22b40 215955: b4392e1 215951: 3162066 v: v3
git-mirror · Oct 6, 2010 · 7ffa77f · 7ffa77f
1 parent 93caff2
commit 7ffa77f
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: a5a84755c5900416dce0166ac825866aad8048ef
+refs/heads/master: 92a5bbc11ff2442a54b2f1d313088c245828ef4e
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
@@ -2851,7 +2851,7 @@ int kmem_cache_shrink(struct kmem_cache *s)
 }
 EXPORT_SYMBOL(kmem_cache_shrink);
 
-#if defined(CONFIG_NUMA) && defined(CONFIG_MEMORY_HOTPLUG)
+#if defined(CONFIG_MEMORY_HOTPLUG)
 static int slab_mem_going_offline_callback(void *arg)
 {
 	struct kmem_cache *s;