diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2013-01-09 12:08:15 +0100 |
|---|---|---|
| committer | Steven Rostedt <rostedt@rostedt.homelinux.com> | 2013-03-28 23:05:20 -0400 |
| commit | 1cc5eff0df7444119f4a801246209e02136f81f4 (patch) | |
| tree | 899a0fee0c2e5b77011b62fc1710f8c781d67901 /mm | |
| parent | 11d185a7021e88585f7c546fff8982cf4b1c7fb2 (diff) | |
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>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/slub.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/mm/slub.c b/mm/slub.c index 11597eea6d16..75a8ffd883fd 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1280,14 +1280,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; @@ -1327,11 +1328,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; |