aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2014-07-31 14:58:28 -0400
committerThomas Gleixner <tglx@linutronix.de>2014-07-31 14:58:28 -0400
commitc6f1224573c3b609bd8073b39f496637a16cc06f (patch)
tree094861eedc43dccd6f215ad35e05873beb3bf88b
parent21d1f908d39559b013ea857c1685253476b95a4a (diff)
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>
-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)
1076 * set the trigger type must match. Also all must 1076 * set the trigger type must match. Also all must
1077 * agree on ONESHOT. 1077 * agree on ONESHOT.
1078 */ 1078 */
1079
1080#define IRQF_MISMATCH \
1081 (IRQF_TRIGGER_MASK | IRQF_ONESHOT | IRQF_NO_SUSPEND)
1082
1083 if (!((old->flags & new->flags) & IRQF_SHARED) || 1079 if (!((old->flags & new->flags) & IRQF_SHARED) ||
1084 ((old->flags ^ new->flags) & IRQF_MISMATCH)) 1080 ((old->flags ^ new->flags) & IRQF_TRIGGER_MASK) ||
1081 ((old->flags ^ new->flags) & IRQF_ONESHOT))
1085 goto mismatch; 1082 goto mismatch;
1086 1083
1087 /* All handlers must agree on per-cpuness */ 1084 /* All handlers must agree on per-cpuness */