From: Nick Piggin PG_active is protected by zone->lru_lock, it does not need TestSet/TestClear operations. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton --- include/linux/page-flags.h | 2 -- mm/swap.c | 4 ++-- mm/vmscan.c | 5 +++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff -puN include/linux/page-flags.h~mm-pageactive-no-testset include/linux/page-flags.h --- devel/include/linux/page-flags.h~mm-pageactive-no-testset 2006-02-16 14:16:17.000000000 -0800 +++ devel-akpm/include/linux/page-flags.h 2006-02-16 14:16:17.000000000 -0800 @@ -246,8 +246,6 @@ extern void __mod_page_state_offset(unsi #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 -puN mm/swap.c~mm-pageactive-no-testset mm/swap.c --- devel/mm/swap.c~mm-pageactive-no-testset 2006-02-16 14:16:17.000000000 -0800 +++ devel-akpm/mm/swap.c 2006-02-16 14:16:17.000000000 -0800 @@ -374,8 +374,8 @@ void __pagevec_lru_add_active(struct pag } 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 -puN mm/vmscan.c~mm-pageactive-no-testset mm/vmscan.c --- devel/mm/vmscan.c~mm-pageactive-no-testset 2006-02-16 14:16:17.000000000 -0800 +++ devel-akpm/mm/vmscan.c 2006-02-16 14:16:17.000000000 -0800 @@ -1274,8 +1274,9 @@ refill_inactive_zone(struct zone *zone, 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)) { _