浏览代码

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>
Thomas Gleixner 11 年之前
父节点
当前提交
c6f1224573
共有 1 个文件被更改,包括 2 次插入5 次删除
  1. 2 5
      kernel/irq/manage.c

+ 2 - 5
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
 		 * set the trigger type must match. Also all must
 		 * agree on ONESHOT.
 		 * agree on ONESHOT.
 		 */
 		 */
-
-#define IRQF_MISMATCH \
-	(IRQF_TRIGGER_MASK | IRQF_ONESHOT | IRQF_NO_SUSPEND)
-
 		if (!((old->flags & new->flags) & IRQF_SHARED) ||
 		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;
 			goto mismatch;
 
 
 		/* All handlers must agree on per-cpuness */
 		/* All handlers must agree on per-cpuness */