diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-05-24 16:16:31 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-06-12 15:32:32 -0400 |
commit | c6f37f12197ac3bd2e5a35f2f0e195ae63d437de (patch) | |
tree | e9609ca63d211911582afcc4b8314887b85a6c46 /mm/vmscan.c | |
parent | e240b58c79144708530138e05f17c6d0d8d744a8 (diff) |
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 'mm/vmscan.c')
-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) | |||
2056 | + global_page_state(NR_INACTIVE_FILE); | 2056 | + global_page_state(NR_INACTIVE_FILE); |
2057 | } | 2057 | } |
2058 | 2058 | ||
2059 | #ifdef CONFIG_PM | 2059 | #ifdef CONFIG_HIBERNATION |
2060 | /* | 2060 | /* |
2061 | * Helper function for shrink_all_memory(). Tries to reclaim 'nr_pages' pages | 2061 | * Helper function for shrink_all_memory(). Tries to reclaim 'nr_pages' pages |
2062 | * from LRU lists system-wide, for given pass and priority. | 2062 | * from LRU lists system-wide, for given pass and priority. |
@@ -2196,7 +2196,7 @@ out: | |||
2196 | 2196 | ||
2197 | return sc.nr_reclaimed; | 2197 | return sc.nr_reclaimed; |
2198 | } | 2198 | } |
2199 | #endif | 2199 | #endif /* CONFIG_HIBERNATION */ |
2200 | 2200 | ||
2201 | /* It's optimal to keep kswapds on the same CPUs as their memory, but | 2201 | /* It's optimal to keep kswapds on the same CPUs as their memory, but |
2202 | not required for correctness. So if the last cpu in a node goes | 2202 | not required for correctness. So if the last cpu in a node goes |