---

yaml --- r: 154293 b: refs/heads/master c: ba52270 h: refs/heads/master i: 154291: 27c2d8c v: v3
git-mirror · Jun 24, 2009 · b999a04 · b999a04
1 parent 37d191e
commit b999a04
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4923abf9f1a4c1864af438a57c1f3686548230e9
+refs/heads/master: ba52270d18fb17ce2cf176b35419dab1e43fe4a3
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
@@ -1085,11 +1085,17 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node)
 {
 	struct page *page;
 	struct kmem_cache_order_objects oo = s->oo;
+	gfp_t alloc_gfp;
 
 	flags |= s->allocflags;
 
-	page = alloc_slab_page(flags | __GFP_NOWARN | __GFP_NORETRY, node,
-									oo);
+	/*
+	 * Let the initial higher-order allocation fail under memory pressure
+	 * so we fall-back to the minimum order allocation.
+	 */
+	alloc_gfp = (flags | __GFP_NOWARN | __GFP_NORETRY) & ~__GFP_NOFAIL;
+
+	page = alloc_slab_page(alloc_gfp, node, oo);
 	if (unlikely(!page)) {
 		oo = s->min;
 		/*