---

yaml --- r: 43482 b: refs/heads/master c: b8b50b6 h: refs/heads/master v: v3
git-mirror · Dec 8, 2006 · 0fb1a60 · 0fb1a60
1 parent c4fc825
commit 0fb1a60
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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,