---

yaml --- r: 73727 b: refs/heads/master c: c642b83 h: refs/heads/master i: 73725: b68f9f4 73723: 83dbd4e 73719: 34569bb 73711: 0b1b4d8 73695: 816f3df 73663: 7a4170a 73599: 43f5df7 73471: bc90049 73215: aaeed48 72703: 95b9ede 71679: f5fb021 69631: 921ed09 65535: 9f7407a v: v3
git-mirror · Nov 15, 2007 · 03c81e4 · 03c81e4
1 parent e6ef390
commit 03c81e4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57d5f66b86079efac5c9a7843cce2a9bcbe58fb8
+refs/heads/master: c642b8391cf8efc3622cc97329a0f46e7cbb70b8
diff --git a/trunk/kernel/irq/handle.c b/trunk/kernel/irq/handle.c
@@ -178,9 +178,11 @@ fastcall unsigned int __do_IRQ(unsigned int irq)
 		 */
 		if (desc->chip->ack)
 			desc->chip->ack(irq);
-		action_ret = handle_IRQ_event(irq, desc->action);
-		if (!noirqdebug)
-			note_interrupt(irq, desc, action_ret);
+		if (likely(!(desc->status & IRQ_DISABLED))) {
+			action_ret = handle_IRQ_event(irq, desc->action);
+			if (!noirqdebug)
+				note_interrupt(irq, desc, action_ret);
+		}
 		desc->chip->end(irq);
 		return 1;
 	}