From 03c81e481aebeb7c37917aa61d2ce8bd59d4dfcc Mon Sep 17 00:00:00 2001 From: Russ Anderson Date: Wed, 14 Nov 2007 17:00:15 -0800 Subject: [PATCH] --- yaml --- r: 73727 b: refs/heads/master c: c642b8391cf8efc3622cc97329a0f46e7cbb70b8 h: refs/heads/master i: 73725: b68f9f4094737d0d728c3b58395e1ef8d4b61e86 73723: 83dbd4ea929efe9a1f92acf66b8c24beb3466d83 73719: 34569bbe5fd888374f7f45172b0dc19f8408d37b 73711: 0b1b4d8571e26046bef016c1cf31720c3b7fa8c0 73695: 816f3dfaf83b2e42c1878c001cbb2e13071f2419 73663: 7a4170ad2ad075b3b143ce7c8f4b0ec239683755 73599: 43f5df7b009259f18367af3174212ca916f2d8ac 73471: bc90049cb1c0e05dc123fe9b1c877c0713f40df6 73215: aaeed48e42b86fe6bab6982c9f262606fe5ae564 72703: 95b9ede29621d113f5e224cc94d0c33e09e6341b 71679: f5fb02189c1c8c5b98f457738ef436ba4b748d48 69631: 921ed091ac973f311a586ba30584b5d916137860 65535: 9f7407a1ae7917d67e0caeb8494b65a264d36c67 v: v3 --- [refs] | 2 +- trunk/kernel/irq/handle.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c08fa62b4bf7..6cfcb998d6dc 100644 --- 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 index e391cbb1f566..dc335ad27525 100644 --- 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; }