[PATCH] mm: PageActive no testset

[linux-block.git] / mm / swap.c

diff --git a/mm/swap.c b/mm/swap.c
index 985324ee9368810a765b384a6ac77346ef53b649..cf88226cf96de9da82000a3458cc41cfdeadd362 100644 (file)
--- 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)