Commit bcb16568 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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"
parents e858e8b0 d7226fb6

kernel/irq/handle.c

+0 −2
Original line number Diff line number Diff line
@@ -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();