diff options
Diffstat (limited to 'mm/vmscan.c')
-rw-r--r-- | mm/vmscan.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c index 53157e157061..4636d9e822c1 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c | |||
@@ -2249,7 +2249,7 @@ static inline bool should_continue_reclaim(struct zone *zone, | |||
2249 | return true; | 2249 | return true; |
2250 | 2250 | ||
2251 | /* If compaction would go ahead or the allocation would succeed, stop */ | 2251 | /* If compaction would go ahead or the allocation would succeed, stop */ |
2252 | switch (compaction_suitable(zone, sc->order)) { | 2252 | switch (compaction_suitable(zone, sc->order, 0, 0)) { |
2253 | case COMPACT_PARTIAL: | 2253 | case COMPACT_PARTIAL: |
2254 | case COMPACT_CONTINUE: | 2254 | case COMPACT_CONTINUE: |
2255 | return false; | 2255 | return false; |
@@ -2346,7 +2346,7 @@ static inline bool compaction_ready(struct zone *zone, int order) | |||
2346 | * If compaction is not ready to start and allocation is not likely | 2346 | * If compaction is not ready to start and allocation is not likely |
2347 | * to succeed without it, then keep reclaiming. | 2347 | * to succeed without it, then keep reclaiming. |
2348 | */ | 2348 | */ |
2349 | if (compaction_suitable(zone, order) == COMPACT_SKIPPED) | 2349 | if (compaction_suitable(zone, order, 0, 0) == COMPACT_SKIPPED) |
2350 | return false; | 2350 | return false; |
2351 | 2351 | ||
2352 | return watermark_ok; | 2352 | return watermark_ok; |
@@ -2824,8 +2824,8 @@ static bool zone_balanced(struct zone *zone, int order, | |||
2824 | balance_gap, classzone_idx, 0)) | 2824 | balance_gap, classzone_idx, 0)) |
2825 | return false; | 2825 | return false; |
2826 | 2826 | ||
2827 | if (IS_ENABLED(CONFIG_COMPACTION) && order && | 2827 | if (IS_ENABLED(CONFIG_COMPACTION) && order && compaction_suitable(zone, |
2828 | compaction_suitable(zone, order) == COMPACT_SKIPPED) | 2828 | order, 0, classzone_idx) == COMPACT_SKIPPED) |
2829 | return false; | 2829 | return false; |
2830 | 2830 | ||
2831 | return true; | 2831 | return true; |
@@ -2952,8 +2952,8 @@ static bool kswapd_shrink_zone(struct zone *zone, | |||
2952 | * from memory. Do not reclaim more than needed for compaction. | 2952 | * from memory. Do not reclaim more than needed for compaction. |
2953 | */ | 2953 | */ |
2954 | if (IS_ENABLED(CONFIG_COMPACTION) && sc->order && | 2954 | if (IS_ENABLED(CONFIG_COMPACTION) && sc->order && |
2955 | compaction_suitable(zone, sc->order) != | 2955 | compaction_suitable(zone, sc->order, 0, classzone_idx) |
2956 | COMPACT_SKIPPED) | 2956 | != COMPACT_SKIPPED) |
2957 | testorder = 0; | 2957 | testorder = 0; |
2958 | 2958 | ||
2959 | /* | 2959 | /* |