diff options
Diffstat (limited to 'mm/vmscan.c')
-rw-r--r-- | mm/vmscan.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c index 0095533cdde9..a740778f688d 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c | |||
@@ -894,7 +894,7 @@ shrink_caches(struct zone **zones, struct scan_control *sc) | |||
894 | if (zone->present_pages == 0) | 894 | if (zone->present_pages == 0) |
895 | continue; | 895 | continue; |
896 | 896 | ||
897 | if (!cpuset_zone_allowed(zone)) | 897 | if (!cpuset_zone_allowed(zone, __GFP_HARDWALL)) |
898 | continue; | 898 | continue; |
899 | 899 | ||
900 | zone->temp_priority = sc->priority; | 900 | zone->temp_priority = sc->priority; |
@@ -940,7 +940,7 @@ int try_to_free_pages(struct zone **zones, unsigned int gfp_mask) | |||
940 | for (i = 0; zones[i] != NULL; i++) { | 940 | for (i = 0; zones[i] != NULL; i++) { |
941 | struct zone *zone = zones[i]; | 941 | struct zone *zone = zones[i]; |
942 | 942 | ||
943 | if (!cpuset_zone_allowed(zone)) | 943 | if (!cpuset_zone_allowed(zone, __GFP_HARDWALL)) |
944 | continue; | 944 | continue; |
945 | 945 | ||
946 | zone->temp_priority = DEF_PRIORITY; | 946 | zone->temp_priority = DEF_PRIORITY; |
@@ -986,7 +986,7 @@ out: | |||
986 | for (i = 0; zones[i] != 0; i++) { | 986 | for (i = 0; zones[i] != 0; i++) { |
987 | struct zone *zone = zones[i]; | 987 | struct zone *zone = zones[i]; |
988 | 988 | ||
989 | if (!cpuset_zone_allowed(zone)) | 989 | if (!cpuset_zone_allowed(zone, __GFP_HARDWALL)) |
990 | continue; | 990 | continue; |
991 | 991 | ||
992 | zone->prev_priority = zone->temp_priority; | 992 | zone->prev_priority = zone->temp_priority; |
@@ -1256,7 +1256,7 @@ void wakeup_kswapd(struct zone *zone, int order) | |||
1256 | return; | 1256 | return; |
1257 | if (pgdat->kswapd_max_order < order) | 1257 | if (pgdat->kswapd_max_order < order) |
1258 | pgdat->kswapd_max_order = order; | 1258 | pgdat->kswapd_max_order = order; |
1259 | if (!cpuset_zone_allowed(zone)) | 1259 | if (!cpuset_zone_allowed(zone, __GFP_HARDWALL)) |
1260 | return; | 1260 | return; |
1261 | if (!waitqueue_active(&zone->zone_pgdat->kswapd_wait)) | 1261 | if (!waitqueue_active(&zone->zone_pgdat->kswapd_wait)) |
1262 | return; | 1262 | return; |