---

yaml --- r: 45251 b: refs/heads/master c: b6a6045 h: refs/heads/master i: 45249: a42468e 45247: 547849a v: v3
git-mirror · Jan 6, 2007 · c2c3b5a · c2c3b5a
1 parent 8c76d60
commit c2c3b5a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be6aab0e9fa6d3c6d75aa1e38ac972d8b4ee82b8
+refs/heads/master: b6a60451813bad6a9f57cb159004c3b3e12a1cd3
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
@@ -3281,7 +3281,7 @@ void *fallback_alloc(struct kmem_cache *cache, gfp_t flags)
 					flags | GFP_THISNODE, nid);
 	}
 
-	if (!obj) {
+	if (!obj && !(flags & __GFP_NO_GROW)) {
 		/*
 		 * This allocation will be performed within the constraints
 		 * of the current cpuset / memory policy requirements.
@@ -3310,7 +3310,7 @@ void *fallback_alloc(struct kmem_cache *cache, gfp_t flags)
 					 */
 					goto retry;
 			} else {
-				kmem_freepages(cache, obj);
+				/* cache_grow already freed obj */
 				obj = NULL;
 			}
 		}