aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Weiner <hannes@cmpxchg.org>2009-02-13 20:03:08 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-02-21 17:17:17 -0500
commit3049103ddfc9aac111916bd2f39ac6976c431517 (patch)
tree709bfc2b40389cac7643e27be5307c81a35c6c4b
parent09664fda48c5dd63277f1f42888ca9d5dca6037a (diff)
swsusp: dont fiddle with swappiness
sc.swappiness is not used in the swsusp memory shrinking path, do not set it. Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Cc: Len Brown <lenb@kernel.org> Cc: Greg KH <gregkh@suse.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/vmscan.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 9a27c44aa327..550e8695070d 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -2112,7 +2112,6 @@ unsigned long shrink_all_memory(unsigned long nr_pages)
2112 .may_swap = 0, 2112 .may_swap = 0,
2113 .swap_cluster_max = nr_pages, 2113 .swap_cluster_max = nr_pages,
2114 .may_writepage = 1, 2114 .may_writepage = 1,
2115 .swappiness = vm_swappiness,
2116 .isolate_pages = isolate_pages_global, 2115 .isolate_pages = isolate_pages_global,
2117 }; 2116 };
2118 2117
@@ -2146,10 +2145,8 @@ unsigned long shrink_all_memory(unsigned long nr_pages)
2146 int prio; 2145 int prio;
2147 2146
2148 /* Force reclaiming mapped pages in the passes #3 and #4 */ 2147 /* Force reclaiming mapped pages in the passes #3 and #4 */
2149 if (pass > 2) { 2148 if (pass > 2)
2150 sc.may_swap = 1; 2149 sc.may_swap = 1;
2151 sc.swappiness = 100;
2152 }
2153 2150
2154 for (prio = DEF_PRIORITY; prio >= 0; prio--) { 2151 for (prio = DEF_PRIORITY; prio >= 0; prio--) {
2155 unsigned long nr_to_scan = nr_pages - ret; 2152 unsigned long nr_to_scan = nr_pages - ret;