irq: Ensure irq_exit() code runs with interrupts disabled

[deliverable/linux.git] / kernel / softirq.c

diff --git a/kernel/softirq.c b/kernel/softirq.c
index f5cc25f147a646e210384d1cb98ae4a97240b3a7..f2a934673008f1f845a976c0fb78a9034dda6ed7 100644 (file)
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -341,6 +341,14 @@ static inline void invoke_softirq(void)
  */
 void irq_exit(void)
 {
+#ifndef __ARCH_IRQ_EXIT_IRQS_DISABLED
+       unsigned long flags;
+
+       local_irq_save(flags);
+#else
+       WARN_ON_ONCE(!irqs_disabled());
+#endif
+
        account_irq_exit_time(current);
        trace_hardirq_exit();
        sub_preempt_count(IRQ_EXIT_OFFSET);
@@ -354,6 +362,9 @@ void irq_exit(void)
 #endif
        rcu_irq_exit();
        sched_preempt_enable_no_resched();
+#ifndef __ARCH_IRQ_EXIT_IRQS_DISABLED
+       local_irq_restore(flags);
+#endif
 }
 
 /*