From 1511f74d20e61138e8f68a7c8f55bcf1cfb137ad Mon Sep 17 00:00:00 2001
From: Christoph Lameter <cl@linux.com>
Date: Wed, 25 Aug 2010 14:51:14 -0500
Subject: [PATCH] --- yaml --- r: 215941 b: refs/heads/master c:
 8de66a0c022c7c575c7481224803292cdabed4c4 h: refs/heads/master i:   215939:
 b819eb4812a630bba62db621fb329aa019258260 v: v3

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

diff --git a/[refs] b/[refs]
index 52b132a4309a..0a78d249f14c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d550c56a24b20e91ec469054230bd2e2485996a
+refs/heads/master: 8de66a0c022c7c575c7481224803292cdabed4c4
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index c1add106c431..b244a5a11a98 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -2909,7 +2909,7 @@ static void slab_mem_offline_callback(void *arg)
 			BUG_ON(slabs_node(s, offline_node));
 
 			s->node[offline_node] = NULL;
-			kmem_cache_free(kmalloc_caches, n);
+			kmem_cache_free(kmem_cache_node, n);
 		}
 	}
 	up_read(&slub_lock);
@@ -2942,7 +2942,7 @@ static int slab_mem_going_online_callback(void *arg)
 		 *      since memory is not yet available from the node that
 		 *      is brought up.
 		 */
-		n = kmem_cache_alloc(kmalloc_caches, GFP_KERNEL);
+		n = kmem_cache_alloc(kmem_cache_node, GFP_KERNEL);
 		if (!n) {
 			ret = -ENOMEM;
 			goto out;