summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-05-05 12:09:27 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-05-05 12:09:27 -0700
commitbcb16568275a9bfaa79efdce6816467927f2c406 (patch)
tree45790b0f37c7d4fd45290b64c4b1f8f576989195 /kernel
parente858e8b07666e96c7206f3c42d233340156ebf0a (diff)
parentd7226fb6ec5d4f325e4e7fd905894e2ea3eb3ae0 (diff)
downloadlinux-bcb16568275a9bfaa79efdce6816467927f2c406.tar.gz
linux-bcb16568275a9bfaa79efdce6816467927f2c406.tar.bz2
linux-bcb16568275a9bfaa79efdce6816467927f2c406.zip
Merge branch 'irq/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* '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"
Diffstat (limited to 'kernel')
-rw-r--r--kernel/irq/handle.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index d82142be8dd2..26e08754744f 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();