提交 3049103d 编写于 作者: J Johannes Weiner 提交者: Linus Torvalds

swsusp: dont fiddle with swappiness

sc.swappiness is not used in the swsusp memory shrinking path, do not
set it.
Signed-off-by: NJohannes Weiner <hannes@cmpxchg.org>
Reviewed-by: NKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
Cc: Len Brown <lenb@kernel.org>
Cc: Greg KH <gregkh@suse.de>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 09664fda
...@@ -2112,7 +2112,6 @@ unsigned long shrink_all_memory(unsigned long nr_pages) ...@@ -2112,7 +2112,6 @@ unsigned long shrink_all_memory(unsigned long nr_pages)
.may_swap = 0, .may_swap = 0,
.swap_cluster_max = nr_pages, .swap_cluster_max = nr_pages,
.may_writepage = 1, .may_writepage = 1,
.swappiness = vm_swappiness,
.isolate_pages = isolate_pages_global, .isolate_pages = isolate_pages_global,
}; };
...@@ -2146,10 +2145,8 @@ unsigned long shrink_all_memory(unsigned long nr_pages) ...@@ -2146,10 +2145,8 @@ unsigned long shrink_all_memory(unsigned long nr_pages)
int prio; int prio;
/* Force reclaiming mapped pages in the passes #3 and #4 */ /* Force reclaiming mapped pages in the passes #3 and #4 */
if (pass > 2) { if (pass > 2)
sc.may_swap = 1; sc.may_swap = 1;
sc.swappiness = 100;
}
for (prio = DEF_PRIORITY; prio >= 0; prio--) { for (prio = DEF_PRIORITY; prio >= 0; prio--) {
unsigned long nr_to_scan = nr_pages - ret; unsigned long nr_to_scan = nr_pages - ret;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册