From b23fcfb46aa1610a3f8f247eaaabbb5ac55a802b Mon Sep 17 00:00:00 2001
From: Paul Jackson <pj@sgi.com>
Date: Sat, 20 May 2006 15:00:11 -0700
Subject: [PATCH] --- yaml --- r: 26859 b: refs/heads/master c:
 92d1dbd27417c54c23aac6a84c285e256f6118b6 h: refs/heads/master i:   26857:
 41bbd98aede09e31653462568e95569206fbce43   26855:
 ac3b1236e3abe949c405564b1200b582f4904cd6 v: v3

---
 [refs]                | 2 +-
 trunk/kernel/cpuset.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6c21b271edb9..7acea074ca81 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36be57ffe39e03aab9fbe857f70c7a6a15bd9e08
+refs/heads/master: 92d1dbd27417c54c23aac6a84c285e256f6118b6
diff --git a/trunk/kernel/cpuset.c b/trunk/kernel/cpuset.c
index 57fd88237afc..ab81fdd4572b 100644
--- a/trunk/kernel/cpuset.c
+++ b/trunk/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 */