summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kernel/irq/handle.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index 3540a7190122..cdd6fbbe771c 100644
--- a/kernel/irq/handle.c
+++ b/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;
}