diff options
Diffstat (limited to 'mm/vmscan.c')
-rw-r--r-- | mm/vmscan.c | 5 |
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; |