Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3049103d authored by Johannes Weiner's avatar Johannes Weiner Committed by Linus Torvalds
Browse files

swsusp: dont fiddle with swappiness 



sc.swappiness is not used in the swsusp memory shrinking path, do not
set it.

Signed-off-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Reviewed-by: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Cc: Len Brown <lenb@kernel.org>
Cc: Greg KH <gregkh@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 09664fda

mm/vmscan.c

+1 −4
Original line number Diff line number Diff line
@@ -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;