From 7c07d81a95e43643c3083eff790636e36b5e7297 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Mon, 29 Oct 2007 04:42:55 +0000
Subject: [PATCH] --- yaml --- r: 72681 b: refs/heads/master c:
 27bb628a1d759cc82ff6360becf61de601907811 h: refs/heads/master i:   72679:
 c1d8f83a6996e50f2693198ba321e50b41ed64bf v: v3

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

diff --git a/[refs] b/[refs]
index b1d27614efb1..b6e9622e67cd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d8a972661832719931b0dd5b80e97215cb93d94
+refs/heads/master: 27bb628a1d759cc82ff6360becf61de601907811
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index aac1dd3c657d..bcdb2c8941a5 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -2734,7 +2734,7 @@ static void slab_mem_offline_callback(void *arg)
 			 * and offline_pages() function shoudn't call this
 			 * callback. So, we must fail.
 			 */
-			BUG_ON(atomic_read(&n->nr_slabs));
+			BUG_ON(atomic_long_read(&n->nr_slabs));
 
 			s->node[offline_node] = NULL;
 			kmem_cache_free(kmalloc_caches, n);