Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

[deliverable/linux.git] / mm / slub.c

diff --git a/mm/slub.c b/mm/slub.c
index b72bc98e2dc19814405764de399a0d4276232028..84ed734b96b3ee83861b7499edd55d7aa479e61a 100644 (file)
--- 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;