aboutsummaryrefslogtreecommitdiffstats
path: root/mm/vmscan.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/vmscan.c')
-rw-r--r--mm/vmscan.c18
1 files changed, 1 insertions, 17 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 6771ea70bfe7..3b4a41d72489 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -2397,7 +2397,6 @@ loop_again:
2397 * cause too much scanning of the lower zones. 2397 * cause too much scanning of the lower zones.
2398 */ 2398 */
2399 for (i = 0; i <= end_zone; i++) { 2399 for (i = 0; i <= end_zone; i++) {
2400 int compaction;
2401 struct zone *zone = pgdat->node_zones + i; 2400 struct zone *zone = pgdat->node_zones + i;
2402 int nr_slab; 2401 int nr_slab;
2403 2402
@@ -2428,24 +2427,9 @@ loop_again:
2428 sc.nr_reclaimed += reclaim_state->reclaimed_slab; 2427 sc.nr_reclaimed += reclaim_state->reclaimed_slab;
2429 total_scanned += sc.nr_scanned; 2428 total_scanned += sc.nr_scanned;
2430 2429
2431 compaction = 0;
2432 if (order &&
2433 zone_watermark_ok(zone, 0,
2434 high_wmark_pages(zone),
2435 end_zone, 0) &&
2436 !zone_watermark_ok(zone, order,
2437 high_wmark_pages(zone),
2438 end_zone, 0)) {
2439 compact_zone_order(zone,
2440 order,
2441 sc.gfp_mask, false,
2442 COMPACT_MODE_KSWAPD);
2443 compaction = 1;
2444 }
2445
2446 if (zone->all_unreclaimable) 2430 if (zone->all_unreclaimable)
2447 continue; 2431 continue;
2448 if (!compaction && nr_slab == 0 && 2432 if (nr_slab == 0 &&
2449 !zone_reclaimable(zone)) 2433 !zone_reclaimable(zone))
2450 zone->all_unreclaimable = 1; 2434 zone->all_unreclaimable = 1;
2451 /* 2435 /*