Revert "SLUB: remove useless masking of GFP_ZERO"

This reverts commit 3811dbf. The masking was not at all useless, and it was sensible. We handle GFP_ZERO in the caller, and passing it down to any page allocator logic is buggy and wrong. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
git-mirror · Mar 28, 2008 · e72e9c2 · e72e9c2
1 parent 8536bba
commit e72e9c2
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/mm/slub.c b/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;