Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c84cacf authored by Nick Piggin's avatar Nick Piggin Committed by Linus Torvalds
Browse files

[PATCH] mm: PageActive no testset 



PG_active is protected by zone->lru_lock, it does not need TestSet/TestClear
operations.

Signed-off-by: default avatarNick Piggin <npiggin@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8d438f96

include/linux/page-flags.h

+0 −2
Original line number Diff line number Diff line
@@ -246,8 +246,6 @@ extern void __mod_page_state_offset(unsigned long offset, unsigned long delta); 
#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)

mm/swap.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

mm/vmscan.c

+3 −2
Original line number Diff line number Diff line
@@ -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)) {