From a23bf48d20f8d92ee3b7c3cfbfb4527f98231761 Mon Sep 17 00:00:00 2001 From: Minchan Kim Date: Tue, 10 Jan 2012 15:08:18 -0800 Subject: [PATCH] --- yaml --- r: 283023 b: refs/heads/master c: 86cfd3a45042ab242d47f3935a02811a402beab6 h: refs/heads/master i: 283021: 2713f31e75b95f2f7266cba7a13c1443aa6bd027 283019: 7e006c31dd6ae2f0f973db19b466940aa749a5b2 283015: e36f0694b7e6e39b3896b6f00f8083791bad4cdc 283007: 848b852ed9df07f1b434662924674f33d27e498f v: v3 --- [refs] | 2 +- trunk/mm/vmscan.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b8fc84bddf82..4d2a8f6a1e79 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 799f933a82d878d7f15215473c5561ce984ada75 +refs/heads/master: 86cfd3a45042ab242d47f3935a02811a402beab6 diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c index 974162c80edb..b935e6f0d695 100644 --- a/trunk/mm/vmscan.c +++ b/trunk/mm/vmscan.c @@ -2000,8 +2000,9 @@ static inline bool should_continue_reclaim(struct zone *zone, * inactive lists are large enough, continue reclaiming */ pages_for_compaction = (2UL << sc->order); - inactive_lru_pages = zone_nr_lru_pages(zone, sc, LRU_INACTIVE_ANON) + - zone_nr_lru_pages(zone, sc, LRU_INACTIVE_FILE); + inactive_lru_pages = zone_nr_lru_pages(zone, sc, LRU_INACTIVE_FILE); + if (nr_swap_pages > 0) + inactive_lru_pages += zone_nr_lru_pages(zone, sc, LRU_INACTIVE_ANON); if (sc->nr_reclaimed < pages_for_compaction && inactive_lru_pages > pages_for_compaction) return true;