summaryrefslogtreecommitdiffstats
path: root/kernel/irq
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2014-07-31 20:58:28 +0200
committerThomas Gleixner <tglx@linutronix.de>2014-07-31 20:58:28 +0200
commitc6f1224573c3b609bd8073b39f496637a16cc06f (patch)
tree094861eedc43dccd6f215ad35e05873beb3bf88b /kernel/irq
parent21d1f908d39559b013ea857c1685253476b95a4a (diff)
downloadtalos-obmc-linux-c6f1224573c3b609bd8073b39f496637a16cc06f.tar.gz
talos-obmc-linux-c6f1224573c3b609bd8073b39f496637a16cc06f.zip
Revert "irq: Warn when shared interrupts do not match on NO_SUSPEND"
This reverts commit 4fae4e7624653ef498d0e2a38f00620b9701ab04. Undo because it breaks working systems. Requested-by: Rafael J. Wysocki <rjw@rjwysocki.net> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/irq')
-rw-r--r--kernel/irq/manage.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 53e944811ca6..3dc6a61bf06a 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -1076,12 +1076,9 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
* set the trigger type must match. Also all must
* agree on ONESHOT.
*/
-
-#define IRQF_MISMATCH \
- (IRQF_TRIGGER_MASK | IRQF_ONESHOT | IRQF_NO_SUSPEND)
-
if (!((old->flags & new->flags) & IRQF_SHARED) ||
- ((old->flags ^ new->flags) & IRQF_MISMATCH))
+ ((old->flags ^ new->flags) & IRQF_TRIGGER_MASK) ||
+ ((old->flags ^ new->flags) & IRQF_ONESHOT))
goto mismatch;
/* All handlers must agree on per-cpuness */
OpenPOWER on IntegriCloud