X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=blobdiff_plain;f=mm%2Fslub.c;h=84ed734b96b3ee83861b7499edd55d7aa479e61a;hp=b72bc98e2dc19814405764de399a0d4276232028;hb=e72e9c23ee025a4c063ca112ba0a6059f9ecc9b7;hpb=8536bbaff44addff8d2ac66da1156c95b1e00c4e

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