From ab7e40c5ed7021c42eb6a53cd5c64cee3b967271 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Wed, 2 Feb 2011 23:58:19 +0100 Subject: [PATCH] --- yaml --- r: 234701 b: refs/heads/master c: b738a50a202639614c98b5763b01bf9201779e50 h: refs/heads/master i: 234699: b97a691e2f576bb7fcca4417757e1a9d07180886 v: v3 --- [refs] | 2 +- trunk/kernel/irq/handle.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0b9995865ffa..ec45bbfba4b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1082687e8d6292a61759eb83358e7db39fed1bf4 +refs/heads/master: b738a50a202639614c98b5763b01bf9201779e50 diff --git a/trunk/kernel/irq/handle.c b/trunk/kernel/irq/handle.c index 3540a7190122..cdd6fbbe771c 100644 --- a/trunk/kernel/irq/handle.c +++ b/trunk/kernel/irq/handle.c @@ -68,6 +68,9 @@ irqreturn_t handle_IRQ_event(unsigned int irq, struct irqaction *action) ret = action->handler(irq, action->dev_id); trace_irq_handler_exit(irq, action, ret); + if (WARN_ON_ONCE(!irqs_disabled())) + local_irq_disable(); + switch (ret) { case IRQ_WAKE_THREAD: /* @@ -114,7 +117,6 @@ irqreturn_t handle_IRQ_event(unsigned int irq, struct irqaction *action) if (status & IRQF_SAMPLE_RANDOM) add_interrupt_randomness(irq); - local_irq_disable(); return retval; }