From 21bb0e1a7b5c2972b5c3fd7da5c67288e477a8fa Mon Sep 17 00:00:00 2001 From: Minchan Kim Date: Thu, 9 May 2013 16:21:25 +0900 Subject: [PATCH] mm: make shrink_page_list with pages work from multiple zones Shrink_page_list expects all pages come from a same zone but it's too limited to use. This patch removes the dependency so next patch can use shrink_page_list with pages from multiple zones. Change-Id: I34469b7f0a79f2b79e30e40033ba8b3e1dd5f2d0 Signed-off-by: Minchan Kim Patch-mainline: linux-mm @ 9 May 2013 16:21:25 [vinmenon@codeaurora.org: trivial merge conflict fixes] Signed-off-by: Vinayak Menon --- mm/vmscan.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index eb06f0cc3f38..a6584d450b33 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -829,7 +829,8 @@ static unsigned long shrink_page_list(struct list_head *page_list, goto keep; VM_BUG_ON(PageActive(page)); - VM_BUG_ON(page_zone(page) != zone); + if (zone) + VM_BUG_ON(page_zone(page) != zone); sc->nr_scanned++; @@ -993,7 +994,7 @@ static unsigned long shrink_page_list(struct list_head *page_list, */ if (page_is_file_cache(page) && (!current_is_kswapd() || - !zone_is_reclaim_dirty(zone))) { + (zone && !zone_is_reclaim_dirty(zone)))) { /* * Immediately reclaim when written back. * Similar in principal to deactivate_page()