---

yaml --- r: 87884 b: refs/heads/master c: e72e9c2 h: refs/heads/master v: v3
git-mirror · Mar 28, 2008 · fe88f85 · fe88f85
1 parent 6f85329
commit fe88f85
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8536bbaff44addff8d2ac66da1156c95b1e00c4e
+refs/heads/master: e72e9c23ee025a4c063ca112ba0a6059f9ecc9b7
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
@@ -1470,6 +1470,9 @@ static void *__slab_alloc(struct kmem_cache *s,
 	void **object;
 	struct page *new;
 
+	/* We handle __GFP_ZERO in the caller */
+	gfpflags &= ~__GFP_ZERO;
+
 	if (!c->page)
 		goto new_slab;