diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-02 10:15:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-02 10:15:39 -0800 |
| commit | a45299e72737c528975546a0680cace5d7364d27 (patch) | |
| tree | 45c97b0f789aa09acffeca70af691dc2dd4f19d7 /include | |
| 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 'include')
| -rw-r--r-- | include/linux/irqreturn.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/irqreturn.h b/include/linux/irqreturn.h index 714ba08dc092..e374e369fb2f 100644 --- a/include/linux/irqreturn.h +++ b/include/linux/irqreturn.h @@ -14,6 +14,6 @@ enum irqreturn { }; typedef enum irqreturn irqreturn_t; -#define IRQ_RETVAL(x) ((x) != IRQ_NONE) +#define IRQ_RETVAL(x) ((x) ? IRQ_HANDLED : IRQ_NONE) #endif |