From d3b56162fbbcb04b1964b793029f48019b97e253 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Sat, 18 Apr 2009 17:23:41 +0200 Subject: [PATCH] --- yaml --- r: 143677 b: refs/heads/master c: a21e25536169432cf9174d631972bc1cd4c75062 h: refs/heads/master i: 143675: 74074e7874d5d594289fa65db136a730baf4fefd v: v3 --- [refs] | 2 +- trunk/mm/vmscan.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6dc782fc8cfe..eb1c53a4ba55 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aefe6475720bd5eb8aacbc881488f3aa65618562 +refs/heads/master: a21e25536169432cf9174d631972bc1cd4c75062 diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c index 39fdfb14eeaa..99155b7b8123 100644 --- a/trunk/mm/vmscan.c +++ b/trunk/mm/vmscan.c @@ -2088,13 +2088,13 @@ static void shrink_all_zones(unsigned long nr_pages, int prio, nr_reclaimed += shrink_list(l, nr_to_scan, zone, sc, prio); if (nr_reclaimed >= nr_pages) { - sc->nr_reclaimed = nr_reclaimed; + sc->nr_reclaimed += nr_reclaimed; return; } } } } - sc->nr_reclaimed = nr_reclaimed; + sc->nr_reclaimed += nr_reclaimed; } /* @@ -2115,6 +2115,7 @@ unsigned long shrink_all_memory(unsigned long nr_pages) .may_unmap = 0, .may_writepage = 1, .isolate_pages = isolate_pages_global, + .nr_reclaimed = 0, }; current->reclaim_state = &reclaim_state;