OSDN Git Service

Revert "irq: Warn when shared interrupts do not match on NO_SUSPEND"
authorThomas Gleixner <tglx@linutronix.de>
Thu, 31 Jul 2014 18:58:28 +0000 (20:58 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 31 Jul 2014 18:58:28 +0000 (20:58 +0200)
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>
kernel/irq/manage.c

index 53e9448..3dc6a61 100644 (file)
@@ -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 */