Skip to content

Commit

Permalink
swsusp: dont fiddle with swappiness
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Johannes Weiner authored and Linus Torvalds committed Feb 21, 2009
1 parent 09664fd commit 3049103
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions mm/vmscan.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};

Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 3049103

Please sign in to comment.