diff options
Diffstat (limited to 'kernel/cpuset.c')
| -rw-r--r-- | kernel/cpuset.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/cpuset.c b/kernel/cpuset.c index 57fd88237afc..ab81fdd4572b 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c | |||
| @@ -2261,6 +2261,7 @@ int __cpuset_zone_allowed(struct zone *z, gfp_t gfp_mask) | |||
| 2261 | if (in_interrupt()) | 2261 | if (in_interrupt()) |
| 2262 | return 1; | 2262 | return 1; |
| 2263 | node = z->zone_pgdat->node_id; | 2263 | node = z->zone_pgdat->node_id; |
| 2264 | might_sleep_if(!(gfp_mask & __GFP_HARDWALL)); | ||
| 2264 | if (node_isset(node, current->mems_allowed)) | 2265 | if (node_isset(node, current->mems_allowed)) |
| 2265 | return 1; | 2266 | return 1; |
| 2266 | if (gfp_mask & __GFP_HARDWALL) /* If hardwall request, stop here */ | 2267 | if (gfp_mask & __GFP_HARDWALL) /* If hardwall request, stop here */ |