---

yaml --- r: 74742 b: refs/heads/master c: 7fd2725 h: refs/heads/master v: v3
git-mirror · Dec 9, 2007 · cd97579 · cd97579
1 parent 6efdd18
commit cd97579
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94545baded0bfbabdc30a3a4cb48b3db479dd6ef
+refs/heads/master: 7fd272550bd43cc1d7289ef0ab2fa50de137e767
diff --git a/trunk/mm/slob.c b/trunk/mm/slob.c
@@ -330,7 +330,7 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
 
 	/* Not enough space: must allocate a new page */
 	if (!b) {
-		b = slob_new_page(gfp, 0, node);
+		b = slob_new_page(gfp & ~__GFP_ZERO, 0, node);
 		if (!b)
 			return 0;
 		sp = (struct slob_page *)virt_to_page(b);

diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
@@ -1468,6 +1468,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;