From 8dec24816ac6c36d297da74cbd7944eb180df685 Mon Sep 17 00:00:00 2001
From: Christoph Lameter <cl@linux.com>
Date: Mon, 10 Jan 2011 10:15:15 -0600
Subject: [PATCH] --- yaml --- r: 231501 b: refs/heads/master c:
 04d94879c8a4973b5499dc26b9d38acee8928791 h: refs/heads/master i:   231499:
 192b47773f38290f4ff240ea0811097a46cdb667 v: v3

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

diff --git a/[refs] b/[refs]
index b47511e68ba1..7e55f70c8166 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 925268a06dc2b1ff7bfcc37419a6827a0e739639
+refs/heads/master: 04d94879c8a4973b5499dc26b9d38acee8928791
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index bec0e355fbad..96e690717822 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -3821,7 +3821,7 @@ static ssize_t show_slab_objects(struct kmem_cache *s,
 		}
 	}
 
-	down_read(&slub_lock);
+	lock_memory_hotplug();
 #ifdef CONFIG_SLUB_DEBUG
 	if (flags & SO_ALL) {
 		for_each_node_state(node, N_NORMAL_MEMORY) {
@@ -3862,7 +3862,7 @@ static ssize_t show_slab_objects(struct kmem_cache *s,
 			x += sprintf(buf + x, " N%d=%lu",
 					node, nodes[node]);
 #endif
-	up_read(&slub_lock);
+	unlock_memory_hotplug();
 	kfree(nodes);
 	return x + sprintf(buf + x, "\n");
 }