aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
Diffstat (limited to 'mm')
-rw-r--r--mm/slub.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/mm/slub.c b/mm/slub.c
index 9892775349bf..5aacd434e2cb 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -2272,17 +2272,15 @@ new_slab:
2272 /* Then do expensive stuff like retrieving pages from the partial lists */ 2272 /* Then do expensive stuff like retrieving pages from the partial lists */
2273 freelist = get_partial(s, gfpflags, node, c); 2273 freelist = get_partial(s, gfpflags, node, c);
2274 2274
2275 if (unlikely(!freelist)) { 2275 if (!freelist)
2276
2277 freelist = new_slab_objects(s, gfpflags, node, &c); 2276 freelist = new_slab_objects(s, gfpflags, node, &c);
2278 2277
2279 if (unlikely(!freelist)) { 2278 if (unlikely(!freelist)) {
2280 if (!(gfpflags & __GFP_NOWARN) && printk_ratelimit()) 2279 if (!(gfpflags & __GFP_NOWARN) && printk_ratelimit())
2281 slab_out_of_memory(s, gfpflags, node); 2280 slab_out_of_memory(s, gfpflags, node);
2282 2281
2283 local_irq_restore(flags); 2282 local_irq_restore(flags);
2284 return NULL; 2283 return NULL;
2285 }
2286 } 2284 }
2287 2285
2288 if (likely(!kmem_cache_debug(s))) 2286 if (likely(!kmem_cache_debug(s)))