2 files changed, 5 insertions, 4 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)
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)) {