Commit a21e2553 authored Apr 18, 2009 by Rafael J. Wysocki Committed by Linus Torvalds Apr 18, 2009

PM/Hibernate: Fix memory shrinking

Commit d979677c ("mm: shrink_all_memory(): use sc.nr_reclaimed")
broke the memory shrinking used by hibernation, becuse it did not update
shrink_all_zones() in accordance with the other changes it made.

Fix this by making shrink_all_zones() update sc->nr_reclaimed instead of
overwriting its value.

This fixes http://bugzilla.kernel.org/show_bug.cgi?id=13058



Reported-and-tested-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent aefe6475

mm/vmscan.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -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;

Admin message