aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/cpuset.c
diff options
context:
space:
mode:
authorPaul Jackson <pj@sgi.com>2006-05-20 15:00:11 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-21 12:59:18 -0700
commit92d1dbd27417c54c23aac6a84c285e256f6118b6 (patch)
treebab665935a47bb6889ddc3c92a9bee68f1f6f532 /kernel/cpuset.c
parent[PATCH] cpuset: update cpuset_zones_allowed comment (diff)
downloadlinux-dev-92d1dbd27417c54c23aac6a84c285e256f6118b6.tar.xz
linux-dev-92d1dbd27417c54c23aac6a84c285e256f6118b6.zip
[PATCH] cpuset: might_sleep_if check in cpuset_zones_allowed
It's too easy to incorrectly call cpuset_zone_allowed() in an atomic context without __GFP_HARDWALL set, and when done, it is not noticed until a tight memory situation forces allocations to be tried outside the current cpuset. Add a 'might_sleep_if()' check, to catch this earlier on, instead of waiting for a similar check in the mutex_lock() code, which is only rarely invoked. Signed-off-by: Paul Jackson <pj@sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to '')
-rw-r--r--kernel/cpuset.c1
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)
if (in_interrupt())
return 1;
node = z->zone_pgdat->node_id;
+ might_sleep_if(!(gfp_mask & __GFP_HARDWALL));
if (node_isset(node, current->mems_allowed))
return 1;
if (gfp_mask & __GFP_HARDWALL) /* If hardwall request, stop here */