diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-02 13:15:39 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-02 13:15:39 -0500 |
| commit | a45299e72737c528975546a0680cace5d7364d27 (patch) | |
| tree | 45c97b0f789aa09acffeca70af691dc2dd4f19d7 /kernel | |
| parent | a0b57ca33ec1cd915ba49051512b3463fa44b4e3 (diff) | |
| parent | 08332dff8adebb74171e98e008d6c20de6658c42 (diff) | |
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixes from Thomas Gleixner:
- Correction of fuzzy and fragile IRQ_RETVAL macro
- IRQ related resume fix affecting only XEN
- ARM/GIC fix for chained GIC controllers
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
irqchip: Gic: fix boot for chained gics
irq: Enable all irqs unconditionally in irq_resume
genirq: Correct fuzzy and fragile IRQ_RETVAL() definition
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/irq/pm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c index cb228bf21760..abcd6ca86cb7 100644 --- a/kernel/irq/pm.c +++ b/kernel/irq/pm.c | |||
| @@ -50,7 +50,7 @@ static void resume_irqs(bool want_early) | |||
| 50 | bool is_early = desc->action && | 50 | bool is_early = desc->action && |
| 51 | desc->action->flags & IRQF_EARLY_RESUME; | 51 | desc->action->flags & IRQF_EARLY_RESUME; |
| 52 | 52 | ||
| 53 | if (is_early != want_early) | 53 | if (!is_early && want_early) |
| 54 | continue; | 54 | continue; |
| 55 | 55 | ||
| 56 | raw_spin_lock_irqsave(&desc->lock, flags); | 56 | raw_spin_lock_irqsave(&desc->lock, flags); |