From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx123.postini.com [74.125.245.123]) by kanga.kvack.org (Postfix) with SMTP id AADBE6B0072 for ; Wed, 8 May 2013 19:39:06 -0400 (EDT) From: Minchan Kim Subject: [PATCH v4 2/6] mm: make shrink_page_list with pages work from multiple zones Date: Thu, 9 May 2013 08:38:58 +0900 Message-Id: <1368056342-30836-3-git-send-email-minchan@kernel.org> In-Reply-To: <1368056342-30836-1-git-send-email-minchan@kernel.org> References: <1368056342-30836-1-git-send-email-minchan@kernel.org> Sender: owner-linux-mm@kvack.org List-ID: To: Andrew Morton Cc: Michael Kerrisk , Rik van Riel , Dave Hansen , Namhyung Kim , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Minchan Kim 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. Signed-off-by: Minchan Kim --- mm/vmscan.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index 6b7cba3..a1fb526 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -706,7 +706,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++; @@ -952,7 +953,7 @@ keep: * back off and wait for congestion to clear because further reclaim * will encounter the same problem */ - if (nr_dirty && nr_dirty == nr_congested && global_reclaim(sc)) + if (nr_dirty && nr_dirty == nr_congested && global_reclaim(sc) && zone) zone_set_flag(zone, ZONE_CONGESTED); free_hot_cold_page_list(&free_pages, 1); -- 1.8.2.1 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org