---

yaml --- r: 31071 b: refs/heads/master c: 6550c77 h: refs/heads/master i: 31069: f4bd237 31067: f8ea8a8 31063: 573dde3 31055: a6b4bff 31039: bf03e5b v: v3
git-mirror · Jun 29, 2006 · a0e6c8f · a0e6c8f
1 parent de9b742
commit a0e6c8f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3418d72404e35eb19e7995cbf3e7a76ba8fefbce
+refs/heads/master: 6550c775cb5ee94c132d93d84de3bb23f0abf37b
diff --git a/trunk/include/linux/irq.h b/trunk/include/linux/irq.h
@@ -41,6 +41,7 @@
 #endif
 
 #define IRQ_NOPROBE	512	/* IRQ is not valid for probing */
+#define IRQ_NOREQUEST	1024	/* IRQ cannot be requested */
 /**
  * struct hw_interrupt_type - hardware interrupt type descriptor
  *

diff --git a/trunk/kernel/irq/manage.c b/trunk/kernel/irq/manage.c
@@ -141,7 +141,7 @@ int can_request_irq(unsigned int irq, unsigned long irqflags)
 {
 	struct irqaction *action;
 
-	if (irq >= NR_IRQS)
+	if (irq >= NR_IRQS || irq_desc[irq].status & IRQ_NOREQUEST)
 		return 0;
 
 	action = irq_desc[irq].action;
@@ -356,6 +356,8 @@ int request_irq(unsigned int irq,
 		return -EINVAL;
 	if (irq >= NR_IRQS)
 		return -EINVAL;
+	if (irq_desc[irq].status & IRQ_NOREQUEST)
+		return -EINVAL;
 	if (!handler)
 		return -EINVAL;
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,6 +41,7 @@ @@
     #endif
     #define IRQ_NOPROBE	512	/* IRQ is not valid for probing */
+    #define IRQ_NOREQUEST	1024	/* IRQ cannot be requested */
     /**
      * struct hw_interrupt_type - hardware interrupt type descriptor
      *
@@ Expand Down @@