diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-05-24 22:16:31 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-06-12 21:32:32 +0200 |
commit | c6f37f12197ac3bd2e5a35f2f0e195ae63d437de (patch) | |
tree | e9609ca63d211911582afcc4b8314887b85a6c46 /mm/vmscan.c | |
parent | PM: Remove bus_type suspend_late()/resume_early() V2 (diff) | |
download | linux-c6f37f12197ac3bd2e5a35f2f0e195ae63d437de.tar.xz linux-c6f37f12197ac3bd2e5a35f2f0e195ae63d437de.zip |
PM/Suspend: Do not shrink memory before suspend
Remove the shrinking of memory from the suspend-to-RAM code, where
it is not really necessary.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Nigel Cunningham <nigel@tuxonice.net>
Acked-by: Wu Fengguang <fengguang.wu@intel.com>
Diffstat (limited to '')
-rw-r--r-- | mm/vmscan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c index d254306562cd..95c08a8cc2ba 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2056,7 +2056,7 @@ unsigned long global_lru_pages(void) + global_page_state(NR_INACTIVE_FILE); } -#ifdef CONFIG_PM +#ifdef CONFIG_HIBERNATION /* * Helper function for shrink_all_memory(). Tries to reclaim 'nr_pages' pages * from LRU lists system-wide, for given pass and priority. @@ -2196,7 +2196,7 @@ out: return sc.nr_reclaimed; } -#endif +#endif /* CONFIG_HIBERNATION */ /* It's optimal to keep kswapds on the same CPUs as their memory, but not required for correctness. So if the last cpu in a node goes |