diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-05-07 05:17:13 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-05-07 05:17:34 -0400 |
commit | 44347d947f628060b92449702071bfe1d31dfb75 (patch) | |
tree | c6ed74610d5b3295df4296659f80f5feb94b28cc /kernel/irq/handle.c | |
parent | d94fc523f3c35bd8013f04827e94756cbc0212f4 (diff) | |
parent | 413f81eba35d6ede9289b0c8a920c013a84fac71 (diff) |
Merge branch 'linus' into tracing/core
Merge reason: tracing/core was on a .30-rc1 base and was missing out on
on a handful of tracing fixes present in .30-rc5-almost.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/irq/handle.c')
-rw-r--r-- | kernel/irq/handle.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c index e68bb5aebe02..5dd2572993cf 100644 --- a/kernel/irq/handle.c +++ b/kernel/irq/handle.c | |||
@@ -360,8 +360,6 @@ irqreturn_t handle_IRQ_event(unsigned int irq, struct irqaction *action) | |||
360 | irqreturn_t ret, retval = IRQ_NONE; | 360 | irqreturn_t ret, retval = IRQ_NONE; |
361 | unsigned int status = 0; | 361 | unsigned int status = 0; |
362 | 362 | ||
363 | WARN_ONCE(!in_irq(), "BUG: IRQ handler called from non-hardirq context!"); | ||
364 | |||
365 | if (!(action->flags & IRQF_DISABLED)) | 363 | if (!(action->flags & IRQF_DISABLED)) |
366 | local_irq_enable_in_hardirq(); | 364 | local_irq_enable_in_hardirq(); |
367 | 365 | ||