Skip to content

Commit

Permalink
Merge branch 'irq/urgent' of git://git.kernel.org/pub/scm/linux/kerne…
Browse files Browse the repository at this point in the history
…l/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"
  • Loading branch information
torvalds committed May 5, 2009
2 parents e858e8b + d7226fb commit bcb1656
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions kernel/irq/handle.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down

0 comments on commit bcb1656

Please sign in to comment.