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 */