X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=mm%2Fslub.c;h=84ed734b96b3ee83861b7499edd55d7aa479e61a;hb=773adff8e983cba1f5844c3be3be224ca6645f26;hp=b72bc98e2dc19814405764de399a0d4276232028;hpb=86d9fc1293aa9456677eab94e9fd2d3a10920548;p=linux-2.6

diff --git a/mm/slub.c b/mm/slub.c
index b72bc98e2d..84ed734b96 100644
--- 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;