diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2013-01-09 12:08:15 +0100 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2015-06-18 18:16:13 -0400 |
| commit | e718326ae200033775e1c58aa4bead1305dd6e2c (patch) | |
| tree | 7b5ad72053953ab1535546660036e6a3754badd3 /mm | |
| parent | b60288957ddcbe79d324350c3195641fc48e7acd (diff) | |
| download | linux-rt-e718326ae200033775e1c58aa4bead1305dd6e2c.tar.gz | |
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>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
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 69cbb579a3e6..534609a0326a 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1309,14 +1309,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; @@ -1357,11 +1358,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; |