[PATCH] mm: PageActive no testset

PG_active is protected by zone->lru_lock, it does not need TestSet/TestClear
operations.

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

3 files changed, 5 insertions, 6 deletions

diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index 58856c823f8b..5d1e7bd85107 100644
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -246,8 +246,6 @@ extern void __mod_page_state_offset(unsigned long offset, unsigned long delta);
 #define PageActive(page)        test_bit(PG_active, &(page)->flags)
 #define SetPageActive(page)     set_bit(PG_active, &(page)->flags)
 #define ClearPageActive(page)   clear_bit(PG_active, &(page)->flags)
-#define TestClearPageActive(page) test_and_clear_bit(PG_active, &(page)->flags)
-#define TestSetPageActive(page) test_and_set_bit(PG_active, &(page)->flags)
 
 #define PageSlab(page)          test_bit(PG_slab, &(page)->flags)
 #define SetPageSlab(page)       set_bit(PG_slab, &(page)->flags)
diff --git a/mm/swap.c b/mm/swap.c
index 985324ee9368..cf88226cf96d 100644
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -374,8 +374,8 @@ void __pagevec_lru_add_active(struct pagevec *pvec)
                 }
                 BUG_ON(PageLRU(page));
                 SetPageLRU(page);
-                if (TestSetPageActive(page))
-                        BUG();
+                BUG_ON(PageActive(page));
+                SetPageActive(page);
                 add_page_to_active_list(zone, page);
         }
         if (zone)
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 40fb37828e8c..8e477b1a4838 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1280,8 +1280,9 @@ refill_inactive_zone(struct zone *zone, struct scan_control *sc)
                 prefetchw_prev_lru_page(page, &l_inactive, flags);
                 BUG_ON(PageLRU(page));
                 SetPageLRU(page);
-                if (!TestClearPageActive(page))
-                        BUG();
+                BUG_ON(!PageActive(page));
+                ClearPageActive(page);
+
                 list_move(&page->lru, &zone->inactive_list);
                 pgmoved++;
                 if (!pagevec_add(&pvec, page)) {