[PATCH] mm: slab less atomics

Atomic operation removal from slab

Signed-off-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/mm/slab.c b/mm/slab.c
index d0bd7f07ab0..5988adf010c 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -1402,7 +1402,7 @@ static void *kmem_getpages(struct kmem_cache *cachep, gfp_t flags, int nodeid)
                 atomic_add(i, &slab_reclaim_pages);
         add_page_state(nr_slab, i);
         while (i--) {
-                SetPageSlab(page);
+                __SetPageSlab(page);
                 page++;
         }
         return addr;
@@ -1418,8 +1418,8 @@ static void kmem_freepages(struct kmem_cache *cachep, void *addr)
         const unsigned long nr_freed = i;
 
         while (i--) {
-                if (!TestClearPageSlab(page))
-                        BUG();
+                BUG_ON(!PageSlab(page));
+                __ClearPageSlab(page);
                 page++;
         }
         sub_page_state(nr_slab, nr_freed);