Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f35c258 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mm/slub: don't wait for high-order page allocation"

parents 10aaa4f7 27b9a61c

mm/slub.c

+2 −0
Original line number Diff line number Diff line
@@ -1360,6 +1360,8 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node) 
	 * so we fall-back to the minimum order allocation.

	 */

	alloc_gfp = (flags | __GFP_NOWARN | __GFP_NORETRY) & ~__GFP_NOFAIL;

	if ((alloc_gfp & __GFP_WAIT) && oo_order(oo) > oo_order(s->min))

		alloc_gfp = (alloc_gfp | __GFP_NOMEMALLOC) & ~__GFP_WAIT;



	page = alloc_slab_page(s, alloc_gfp, node, oo);

	if (unlikely(!page)) {