projects/linux·commit bcb16568

Merge branch 'irq/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

bcb16568 · Linus Torvalds <[email protected]> · 2009-05-05 12:09:27 -07:00

* 'irq/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  Revert "genirq: assert that irq handlers are indeed running in hardirq context"
Commit
bcb16568275a9bfaa79efdce6816467927f2c406
Parents
e858e8b0 · d7226fb6

Merge commit. Changes below are compared with the first parent: e858e8b0.

Changes

1 files changed · +0 −2

FileStatusAddDelContent
kernel/irq/handle.cmodified+0−2View file

kernel/irq/handle.c

View file
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index d82142b..26e0875 100644
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -363,8 +363,6 @@ irqreturn_t handle_IRQ_event(unsigned int irq, struct irqaction *action)
irqreturn_t ret, retval = IRQ_NONE;
unsigned int status = 0;
- WARN_ONCE(!in_irq(), "BUG: IRQ handler called from non-hardirq context!");
-
if (!(action->flags & IRQF_DISABLED))
local_irq_enable_in_hardirq();