diff --git a/[refs] b/[refs] index b812717fef90..4706c72d7150 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 09664fda48c5dd63277f1f42888ca9d5dca6037a +refs/heads/master: 3049103ddfc9aac111916bd2f39ac6976c431517 diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c index 9a27c44aa327..550e8695070d 100644 --- a/trunk/mm/vmscan.c +++ b/trunk/mm/vmscan.c @@ -2112,7 +2112,6 @@ unsigned long shrink_all_memory(unsigned long nr_pages) .may_swap = 0, .swap_cluster_max = nr_pages, .may_writepage = 1, - .swappiness = vm_swappiness, .isolate_pages = isolate_pages_global, }; @@ -2146,10 +2145,8 @@ unsigned long shrink_all_memory(unsigned long nr_pages) int prio; /* Force reclaiming mapped pages in the passes #3 and #4 */ - if (pass > 2) { + if (pass > 2) sc.may_swap = 1; - sc.swappiness = 100; - } for (prio = DEF_PRIORITY; prio >= 0; prio--) { unsigned long nr_to_scan = nr_pages - ret;