From 539c144dad6865eab1a64b80d2f3cc157e7c98c6 Mon Sep 17 00:00:00 2001
From: Christoph Lameter <clameter@sgi.com>
Date: Wed, 22 Aug 2007 14:01:56 -0700
Subject: [PATCH] --- yaml --- r: 64262 b: refs/heads/master c:
 9e86943b6c74f214ce0516d56e55636d52252e19 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index daa0ea83a75e..204568488020 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe58103a56f05613cb1f0ef228354d4d5f6c2b08
+refs/heads/master: 9e86943b6c74f214ce0516d56e55636d52252e19
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index 69d02e3e439e..0c106d73f9c5 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -3112,7 +3112,7 @@ static int list_locations(struct kmem_cache *s, char *buf,
 		unsigned long flags;
 		struct page *page;
 
-		if (!atomic_read(&n->nr_slabs))
+		if (!atomic_long_read(&n->nr_slabs))
 			continue;
 
 		spin_lock_irqsave(&n->list_lock, flags);
@@ -3247,7 +3247,7 @@ static unsigned long slab_objects(struct kmem_cache *s,
 		}
 
 		if (flags & SO_FULL) {
-			int full_slabs = atomic_read(&n->nr_slabs)
+			int full_slabs = atomic_long_read(&n->nr_slabs)
 					- per_cpu[node]
 					- n->nr_partial;
 
@@ -3283,7 +3283,7 @@ static int any_slab_objects(struct kmem_cache *s)
 	for_each_node(node) {
 		struct kmem_cache_node *n = get_node(s, node);
 
-		if (n->nr_partial || atomic_read(&n->nr_slabs))
+		if (n->nr_partial || atomic_long_read(&n->nr_slabs))
 			return 1;
 	}
 	return 0;