diff options
Diffstat (limited to 'mm/vmscan.c')
-rw-r--r-- | mm/vmscan.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c index dcb47074ae03..38878b2ab1d0 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c | |||
@@ -2405,7 +2405,8 @@ static bool shrink_zones(struct zonelist *zonelist, struct scan_control *sc) | |||
2405 | * to global LRU. | 2405 | * to global LRU. |
2406 | */ | 2406 | */ |
2407 | if (global_reclaim(sc)) { | 2407 | if (global_reclaim(sc)) { |
2408 | if (!cpuset_zone_allowed_hardwall(zone, GFP_KERNEL)) | 2408 | if (!cpuset_zone_allowed(zone, |
2409 | GFP_KERNEL | __GFP_HARDWALL)) | ||
2409 | continue; | 2410 | continue; |
2410 | 2411 | ||
2411 | lru_pages += zone_reclaimable_pages(zone); | 2412 | lru_pages += zone_reclaimable_pages(zone); |
@@ -3388,7 +3389,7 @@ void wakeup_kswapd(struct zone *zone, int order, enum zone_type classzone_idx) | |||
3388 | if (!populated_zone(zone)) | 3389 | if (!populated_zone(zone)) |
3389 | return; | 3390 | return; |
3390 | 3391 | ||
3391 | if (!cpuset_zone_allowed_hardwall(zone, GFP_KERNEL)) | 3392 | if (!cpuset_zone_allowed(zone, GFP_KERNEL | __GFP_HARDWALL)) |
3392 | return; | 3393 | return; |
3393 | pgdat = zone->zone_pgdat; | 3394 | pgdat = zone->zone_pgdat; |
3394 | if (pgdat->kswapd_max_order < order) { | 3395 | if (pgdat->kswapd_max_order < order) { |