diff --git a/[refs] b/[refs] index 746cab8aeab1..c4691d60672e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8536bbaff44addff8d2ac66da1156c95b1e00c4e +refs/heads/master: e72e9c23ee025a4c063ca112ba0a6059f9ecc9b7 diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c index b72bc98e2dc1..84ed734b96b3 100644 --- a/trunk/mm/slub.c +++ b/trunk/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;