aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2007-08-22 17:01:56 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-22 22:52:47 -0400
commit9e86943b6c74f214ce0516d56e55636d52252e19 (patch)
treef5ba2d57e7a5d5a031f1e6a418e7d5e2c5a838b8 /mm
parentfe58103a56f05613cb1f0ef228354d4d5f6c2b08 (diff)
SLUB: use atomic_long_read for atomic_long variables
SLUB is using atomic_read() for variables declared atomic_long_t. Switch to atomic_long_read(). Signed-off-by: Christoph Lameter <clameter@sgi.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/slub.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/slub.c b/mm/slub.c
index 69d02e3e439e..0c106d73f9c5 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -3112,7 +3112,7 @@ static int list_locations(struct kmem_cache *s, char *buf,
3112 unsigned long flags; 3112 unsigned long flags;
3113 struct page *page; 3113 struct page *page;
3114 3114
3115 if (!atomic_read(&n->nr_slabs)) 3115 if (!atomic_long_read(&n->nr_slabs))
3116 continue; 3116 continue;
3117 3117
3118 spin_lock_irqsave(&n->list_lock, flags); 3118 spin_lock_irqsave(&n->list_lock, flags);
@@ -3247,7 +3247,7 @@ static unsigned long slab_objects(struct kmem_cache *s,
3247 } 3247 }
3248 3248
3249 if (flags & SO_FULL) { 3249 if (flags & SO_FULL) {
3250 int full_slabs = atomic_read(&n->nr_slabs) 3250 int full_slabs = atomic_long_read(&n->nr_slabs)
3251 - per_cpu[node] 3251 - per_cpu[node]
3252 - n->nr_partial; 3252 - n->nr_partial;
3253 3253
@@ -3283,7 +3283,7 @@ static int any_slab_objects(struct kmem_cache *s)
3283 for_each_node(node) { 3283 for_each_node(node) {
3284 struct kmem_cache_node *n = get_node(s, node); 3284 struct kmem_cache_node *n = get_node(s, node);
3285 3285
3286 if (n->nr_partial || atomic_read(&n->nr_slabs)) 3286 if (n->nr_partial || atomic_long_read(&n->nr_slabs))
3287 return 1; 3287 return 1;
3288 } 3288 }
3289 return 0; 3289 return 0;