[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>

1 files changed, 2 insertions, 2 deletions

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)