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

Commit 2fd66c51 authored by Christoph Lameter's avatar Christoph Lameter Committed by Pekka Enberg
Browse files

slub: Add missing irq restore for the OOM path 



OOM path is missing the irq restore in the CONFIG_CMPXCHG_LOCAL case.

Signed-off-by: default avatarChristoph Lameter <cl@linux.com>
Signed-off-by: default avatarPekka Enberg <penberg@kernel.org>
parent f741a79e

mm/slub.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -1857,6 +1857,9 @@ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, 
	}

	}

	if (!(gfpflags & __GFP_NOWARN) && printk_ratelimit())

	if (!(gfpflags & __GFP_NOWARN) && printk_ratelimit())

		slab_out_of_memory(s, gfpflags, node);

		slab_out_of_memory(s, gfpflags, node);

#ifdef CONFIG_CMPXCHG_LOCAL

	local_irq_restore(flags);

#endif

	return NULL;

	return NULL;

debug:

debug:

	if (!alloc_debug_processing(s, c->page, object, addr))

	if (!alloc_debug_processing(s, c->page, object, addr))