|
@@ -2281,11 +2281,11 @@ new_slab:
|
|
|
}
|
|
|
|
|
|
page = c->page;
|
|
|
- if (likely(!kmem_cache_debug(s)))
|
|
|
+ if (likely(!kmem_cache_debug(s) && pfmemalloc_match(page, gfpflags)))
|
|
|
goto load_freelist;
|
|
|
|
|
|
/* Only entered in the debug case */
|
|
|
- if (!alloc_debug_processing(s, page, freelist, addr))
|
|
|
+ if (kmem_cache_debug(s) && !alloc_debug_processing(s, page, freelist, addr))
|
|
|
goto new_slab; /* Slab failed checks. Next slab needed */
|
|
|
|
|
|
deactivate_slab(s, page, get_freepointer(s, freelist));
|
|
@@ -2337,8 +2337,7 @@ redo:
|
|
|
|
|
|
object = c->freelist;
|
|
|
page = c->page;
|
|
|
- if (unlikely(!object || !node_match(page, node) ||
|
|
|
- !pfmemalloc_match(page, gfpflags)))
|
|
|
+ if (unlikely(!object || !node_match(page, node)))
|
|
|
object = __slab_alloc(s, gfpflags, node, addr, c);
|
|
|
|
|
|
else {
|