diff options
Diffstat (limited to 'mm/vmscan.c')
-rw-r--r-- | mm/vmscan.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c index 33dc256033b5..ca46080bb074 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c | |||
@@ -2352,8 +2352,6 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist, | |||
2352 | 2352 | ||
2353 | for (priority = DEF_PRIORITY; priority >= 0; priority--) { | 2353 | for (priority = DEF_PRIORITY; priority >= 0; priority--) { |
2354 | sc->nr_scanned = 0; | 2354 | sc->nr_scanned = 0; |
2355 | if (!priority) | ||
2356 | disable_swap_token(sc->target_mem_cgroup); | ||
2357 | aborted_reclaim = shrink_zones(priority, zonelist, sc); | 2355 | aborted_reclaim = shrink_zones(priority, zonelist, sc); |
2358 | 2356 | ||
2359 | /* | 2357 | /* |
@@ -2704,10 +2702,6 @@ loop_again: | |||
2704 | unsigned long lru_pages = 0; | 2702 | unsigned long lru_pages = 0; |
2705 | int has_under_min_watermark_zone = 0; | 2703 | int has_under_min_watermark_zone = 0; |
2706 | 2704 | ||
2707 | /* The swap token gets in the way of swapout... */ | ||
2708 | if (!priority) | ||
2709 | disable_swap_token(NULL); | ||
2710 | |||
2711 | all_zones_ok = 1; | 2705 | all_zones_ok = 1; |
2712 | balanced = 0; | 2706 | balanced = 0; |
2713 | 2707 | ||