From 0fb1a608ff3654ef772096eac03470924e50a06e Mon Sep 17 00:00:00 2001
From: Paul Jackson <pj@sgi.com>
Date: Fri, 8 Dec 2006 02:35:53 -0800
Subject: [PATCH] --- yaml --- r: 43482 b: refs/heads/master c:
 b8b50b6519afa9891b753c4fffa89d89e04df66a h: refs/heads/master v: v3

---
 [refs]          | 2 +-
 trunk/mm/slab.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6671604bec09..8b833965b136 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01a732eb22dab153732b94962467eaabb1fd3797
+refs/heads/master: b8b50b6519afa9891b753c4fffa89d89e04df66a
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
index 068cb4503c15..e90b6100a927 100644
--- a/trunk/mm/slab.c
+++ b/trunk/mm/slab.c
@@ -3182,7 +3182,7 @@ void *fallback_alloc(struct kmem_cache *cache, gfp_t flags)
 	for (z = zonelist->zones; *z && !obj; z++) {
 		nid = zone_to_nid(*z);
 
-		if (cpuset_zone_allowed(*z, flags) &&
+		if (cpuset_zone_allowed(*z, flags | __GFP_HARDWALL) &&
 			cache->nodelists[nid] &&
 			cache->nodelists[nid]->free_objects)
 				obj = ____cache_alloc_node(cache,