diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2013-02-13 17:13:51 +0100 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-04-24 15:13:36 -0400 |
| commit | 816d62a578ebf195c7164798e5b2c5e728acc699 (patch) | |
| tree | 0236072d9ed66aaffb07f37fcbf8034778bbb4aa | |
| parent | a8c2f2aed5fe4bb6a77398629dce24fd46998433 (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>
[bigeasy@linutronix: fix !page conflict]
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
| -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 624deaa9258c..bdb7f3ac4693 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1293,14 +1293,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; @@ -1324,11 +1325,7 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node) stat(s, ORDER_FALLBACK); } -#ifdef CONFIG_PREEMPT_RT_FULL - if (system_state == SYSTEM_RUNNING) -#else - if (flags & __GFP_WAIT) -#endif + if (enableirqs) local_irq_disable(); if (!page) |