diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2013-01-09 11:08:15 (GMT) |
---|---|---|
committer | Scott Wood <scottwood@freescale.com> | 2015-02-13 22:20:26 (GMT) |
commit | 5515a26616e4e2691d904e54074c0b3ab41268ed (patch) | |
tree | ee971127ed8c9a931addb9598e989ab0f9f79cab | |
parent | 6045f0f9e12a282af2301ec608f430336f264a21 (diff) | |
download | linux-fsl-qoriq-5515a26616e4e2691d904e54074c0b3ab41268ed.tar.xz |
slub: Enable irqs for __GFP_WAIT
SYSTEM_RUNNING might be too late for enabling interrupts. Allocations
with GFP_WAIT can happen before that. So use this as an indicator.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r-- | mm/slub.c | 13 |
1 files changed, 5 insertions, 8 deletions
@@ -1297,14 +1297,15 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node) struct page *page; struct kmem_cache_order_objects oo = s->oo; gfp_t alloc_gfp; + bool enableirqs; flags &= gfp_allowed_mask; + enableirqs = (flags & __GFP_WAIT) != 0; #ifdef CONFIG_PREEMPT_RT_FULL - if (system_state == SYSTEM_RUNNING) -#else - if (flags & __GFP_WAIT) + enableirqs |= system_state == SYSTEM_RUNNING; #endif + if (enableirqs) local_irq_enable(); flags |= s->allocflags; @@ -1344,11 +1345,7 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node) kmemcheck_mark_unallocated_pages(page, pages); } -#ifdef CONFIG_PREEMPT_RT_FULL - if (system_state == SYSTEM_RUNNING) -#else - if (flags & __GFP_WAIT) -#endif + if (enableirqs) local_irq_disable(); if (!page) return NULL; |