summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-05-09 14:59:05 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-05-09 14:59:05 -0700
commit9d88f22a819db8a9ff78496edf5553e90d88179c (patch)
tree299883c36423e212fdade7f7a4cb564b028f7f5e /kernel
parent95f3b1f4b1df4716ce2db8aa2243b7e288eeb9a7 (diff)
parent1dcc73d7bb0429994c54d33b40c5fb82b741a791 (diff)
downloadlinux-9d88f22a819db8a9ff78496edf5553e90d88179c.tar.bz2
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq updates from Thomas Gleixner: "Two patches from the irq departement: - a simple fix to make dummy_irq_chip usable for wakeup scenarios - removal of the gic arch_extn hackery. Now that all users are converted we really want to get rid of the interface so people wont come up with new use cases" * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: irqchip: gic: Drop support for gic_arch_extn genirq: Set IRQCHIP_SKIP_SET_WAKE flag for dummy_irq_chip
Diffstat (limited to 'kernel')
-rw-r--r--kernel/irq/dummychip.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/irq/dummychip.c b/kernel/irq/dummychip.c
index 988dc58e8847..2feb6feca0cc 100644
--- a/kernel/irq/dummychip.c
+++ b/kernel/irq/dummychip.c
@@ -57,5 +57,6 @@ struct irq_chip dummy_irq_chip = {
.irq_ack = noop,
.irq_mask = noop,
.irq_unmask = noop,
+ .flags = IRQCHIP_SKIP_SET_WAKE,
};
EXPORT_SYMBOL_GPL(dummy_irq_chip);