diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-02-10 14:44:01 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-02-10 14:44:01 +0100 |
| commit | d128dfb514f55af040c38a6b3b131d72b6f115d0 (patch) | |
| tree | c53755d2aa94bd71ca89008c2aaea8a39c24f24e /drivers/irqchip/irq-mxs.c | |
| parent | 3d88460dbd285e7f32437b530d5bb7cb916142fa (diff) | |
| parent | 88e20c74ee020f9e0c99dfce0dd9aa61c3f0cca0 (diff) | |
Merge tag 'irqchip-fixes-4.10' of git://git.infradead.org/users/jcooper/linux into irq/urgent
Pull irqchip fixes for v4.10 from Jason Cooper
- keystone: Fix scheduling while atomic for realtime
- mxs: Enable SKIP_SET_WAKE and MASK_ON_SUSPEND
Diffstat (limited to 'drivers/irqchip/irq-mxs.c')
| -rw-r--r-- | drivers/irqchip/irq-mxs.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/irqchip/irq-mxs.c b/drivers/irqchip/irq-mxs.c index 17304705f2cf..05fa9f7af53c 100644 --- a/drivers/irqchip/irq-mxs.c +++ b/drivers/irqchip/irq-mxs.c @@ -131,12 +131,16 @@ static struct irq_chip mxs_icoll_chip = { .irq_ack = icoll_ack_irq, .irq_mask = icoll_mask_irq, .irq_unmask = icoll_unmask_irq, + .flags = IRQCHIP_MASK_ON_SUSPEND | + IRQCHIP_SKIP_SET_WAKE, }; static struct irq_chip asm9260_icoll_chip = { .irq_ack = icoll_ack_irq, .irq_mask = asm9260_mask_irq, .irq_unmask = asm9260_unmask_irq, + .flags = IRQCHIP_MASK_ON_SUSPEND | + IRQCHIP_SKIP_SET_WAKE, }; asmlinkage void __exception_irq_entry icoll_handle_irq(struct pt_regs *regs) |