diff --git a/[refs] b/[refs] index cff7ebd86283..dd2c80e3d166 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 69cb8e6b7c2982e015d2b35a34ac2674c79e801c +refs/heads/master: 7db0d7054048da140798d8bfdd7fff5f74f85abf diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c index 30c4558acc8b..d4b76bea5dba 100644 --- a/trunk/mm/slub.c +++ b/trunk/mm/slub.c @@ -2064,9 +2064,6 @@ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, c = this_cpu_ptr(s->cpu_slab); #endif - /* We handle __GFP_ZERO in the caller */ - gfpflags &= ~__GFP_ZERO; - page = c->page; if (!page) goto new_slab; @@ -2163,7 +2160,6 @@ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, c->freelist = get_freepointer(s, object); deactivate_slab(s, c); - c->page = NULL; c->node = NUMA_NO_NODE; local_irq_restore(flags); return object;