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

Commit 5205e56e authored by KOSAKI Motohiro's avatar KOSAKI Motohiro Committed by Linus Torvalds
Browse files

vmscan: move ClearPageActive from move_active_pages() to shrink_active_list() 



The move_active_pages_to_lru() function is called under irq disabled and
ClearPageActive() doesn't need irq disabling.

Then, this patch move it into shrink_active_list().

Signed-off-by: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Reviewed-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Minchan Kim <minchan.kim@gmail.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent de2e7567

mm/vmscan.c

+1 −4
Original line number Diff line number Diff line
@@ -1278,10 +1278,6 @@ static void move_active_pages_to_lru(struct zone *zone, 
		VM_BUG_ON(PageLRU(page));

		SetPageLRU(page);



		VM_BUG_ON(!PageActive(page));

		if (!is_active_lru(lru))

			ClearPageActive(page);	/* we are de-activating */



		list_move(&page->lru, &zone->lru[lru].list);

		mem_cgroup_add_lru_list(page, lru);

		pgmoved++;
@@ -1363,6 +1359,7 @@ static void shrink_active_list(unsigned long nr_pages, struct zone *zone, 
			}

		}



		ClearPageActive(page);	/* we are de-activating */

		list_add(&page->lru, &l_inactive);

	}