From 7ffa77f47e22d99ef6ed301d63b6546d039c4a1b Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@kernel.org>
Date: Wed, 6 Oct 2010 16:58:16 +0300
Subject: [PATCH] --- yaml --- r: 215959 b: refs/heads/master c:
 92a5bbc11ff2442a54b2f1d313088c245828ef4e h: refs/heads/master i:   215957:
 9d22b4019f52b2832ff98634c502fe6de8f3e9a8   215955:
 b4392e11d89c6021b8b5c28e9ba17d9b2c7550bc   215951:
 316206674a9f4abef17cd6d8372a8e7d2ae5ac8c v: v3

---
 [refs]          | 2 +-
 trunk/mm/slub.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b04d6ba3edaf..b64c87c1847f 100644
--- 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
index fe536d3474d6..8fd5401bb071 100644
--- 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;