diff --git a/[refs] b/[refs] index 4f1d2dfde168..abc7afa29188 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4d4c4e24cf48400a24d33feffc7cca4f4e8cabe1 +refs/heads/master: 4cd5d1115c2f752ca94a0eb461b36d88fb37ed1e diff --git a/trunk/kernel/softirq.c b/trunk/kernel/softirq.c index f42ff97e1f8f..dce38fac4f32 100644 --- a/trunk/kernel/softirq.c +++ b/trunk/kernel/softirq.c @@ -334,9 +334,7 @@ static inline void invoke_softirq(void) void irq_exit(void) { #ifndef __ARCH_IRQ_EXIT_IRQS_DISABLED - unsigned long flags; - - local_irq_save(flags); + local_irq_disable(); #else WARN_ON_ONCE(!irqs_disabled()); #endif @@ -353,9 +351,6 @@ void irq_exit(void) tick_nohz_irq_exit(); #endif rcu_irq_exit(); -#ifndef __ARCH_IRQ_EXIT_IRQS_DISABLED - local_irq_restore(flags); -#endif } /*