mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-08 15:04:45 +00:00
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>
This commit is contained in:
parent
09664fda48
commit
3049103ddf
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user