From: Nick Piggin In the page release paths, we can be sure that nobody will mess with our page->flags because the refcount has dropped to 0. So no need for atomic operations here. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton --- include/linux/mm_inline.h | 2 +- include/linux/page-flags.h | 2 ++ mm/swap.c | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff -puN include/linux/mm_inline.h~mm-less-atomic-ops include/linux/mm_inline.h --- devel/include/linux/mm_inline.h~mm-less-atomic-ops 2006-02-07 13:19:19.000000000 -0800 +++ devel-akpm/include/linux/mm_inline.h 2006-02-07 13:19:19.000000000 -0800 @@ -32,7 +32,7 @@ del_page_from_lru(struct zone *zone, str { list_del(&page->lru); if (PageActive(page)) { - ClearPageActive(page); + __ClearPageActive(page); zone->nr_active--; } else { zone->nr_inactive--; diff -puN include/linux/page-flags.h~mm-less-atomic-ops include/linux/page-flags.h --- devel/include/linux/page-flags.h~mm-less-atomic-ops 2006-02-07 13:19:19.000000000 -0800 +++ devel-akpm/include/linux/page-flags.h 2006-02-07 13:19:19.000000000 -0800 @@ -242,10 +242,12 @@ extern void __mod_page_state_offset(unsi #define PageLRU(page) test_bit(PG_lru, &(page)->flags) #define SetPageLRU(page) set_bit(PG_lru, &(page)->flags) #define ClearPageLRU(page) clear_bit(PG_lru, &(page)->flags) +#define __ClearPageLRU(page) __clear_bit(PG_lru, &(page)->flags) #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 __ClearPageActive(page) __clear_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-less-atomic-ops mm/swap.c --- devel/mm/swap.c~mm-less-atomic-ops 2006-02-07 13:19:19.000000000 -0800 +++ devel-akpm/mm/swap.c 2006-02-07 13:19:19.000000000 -0800 @@ -215,7 +215,7 @@ void fastcall __page_cache_release(struc spin_lock_irqsave(&zone->lru_lock, flags); BUG_ON(!PageLRU(page)); - ClearPageLRU(page); + __ClearPageLRU(page); del_page_from_lru(zone, page); spin_unlock_irqrestore(&zone->lru_lock, flags); } @@ -266,7 +266,7 @@ void release_pages(struct page **pages, spin_lock_irq(&zone->lru_lock); } BUG_ON(!PageLRU(page)); - ClearPageLRU(page); + __ClearPageLRU(page); del_page_from_lru(zone, page); } _