Avoid double memclear() in SLOB/SLUB

[linux-2.6-omap-h63xx.git] / mm / slub.c

diff --git a/mm/slub.c b/mm/slub.c
index b9f37cb0f2e6a61d80eeca2b3c9dc3799e863bce..9c1d9f3b364f63d7a6be5cdc5f98f2b18f8f797a 100644 (file)
--- a/mm/slub.c
+++ b/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;