diff options
Diffstat (limited to 'mm/slub.c')
-rw-r--r-- | mm/slub.c | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -2064,9 +2064,6 @@ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, | |||
2064 | c = this_cpu_ptr(s->cpu_slab); | 2064 | c = this_cpu_ptr(s->cpu_slab); |
2065 | #endif | 2065 | #endif |
2066 | 2066 | ||
2067 | /* We handle __GFP_ZERO in the caller */ | ||
2068 | gfpflags &= ~__GFP_ZERO; | ||
2069 | |||
2070 | page = c->page; | 2067 | page = c->page; |
2071 | if (!page) | 2068 | if (!page) |
2072 | goto new_slab; | 2069 | goto new_slab; |
@@ -2163,7 +2160,6 @@ debug: | |||
2163 | 2160 | ||
2164 | c->freelist = get_freepointer(s, object); | 2161 | c->freelist = get_freepointer(s, object); |
2165 | deactivate_slab(s, c); | 2162 | deactivate_slab(s, c); |
2166 | c->page = NULL; | ||
2167 | c->node = NUMA_NO_NODE; | 2163 | c->node = NUMA_NO_NODE; |
2168 | local_irq_restore(flags); | 2164 | local_irq_restore(flags); |
2169 | return object; | 2165 | return object; |