diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/cpuset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/cpuset.c b/kernel/cpuset.c index 4ea6f0dc2fc5..76940361273e 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c | |||
@@ -2316,7 +2316,7 @@ int __cpuset_zone_allowed(struct zone *z, gfp_t gfp_mask) | |||
2316 | const struct cpuset *cs; /* current cpuset ancestors */ | 2316 | const struct cpuset *cs; /* current cpuset ancestors */ |
2317 | int allowed; /* is allocation in zone z allowed? */ | 2317 | int allowed; /* is allocation in zone z allowed? */ |
2318 | 2318 | ||
2319 | if (in_interrupt()) | 2319 | if (in_interrupt() || (gfp_mask & __GFP_THISNODE)) |
2320 | return 1; | 2320 | return 1; |
2321 | node = z->zone_pgdat->node_id; | 2321 | node = z->zone_pgdat->node_id; |
2322 | might_sleep_if(!(gfp_mask & __GFP_HARDWALL)); | 2322 | might_sleep_if(!(gfp_mask & __GFP_HARDWALL)); |