aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/softirq.c
diff options
context:
space:
mode:
authorFrederic Weisbecker <fweisbec@gmail.com>2013-02-28 14:00:43 -0500
committerFrederic Weisbecker <fweisbec@gmail.com>2013-02-28 14:00:43 -0500
commit4cd5d1115c2f752ca94a0eb461b36d88fb37ed1e (patch)
treec36ae69ce4ed479d55d407a4243eb569bb56afc1 /kernel/softirq.c
parent4d4c4e24cf48400a24d33feffc7cca4f4e8cabe1 (diff)
irq: Don't re-enable interrupts at the end of irq_exit
Commit 74eed0163d0def3fce27228d9ccf3d36e207b286 "irq: Ensure irq_exit() code runs with interrupts disabled" restore interrupts flags in the end of irq_exit() for archs that don't define __ARCH_IRQ_EXIT_IRQS_DISABLED. However always returning from irq_exit() with interrupts disabled should not be a problem for these archs. Prior to this commit this was already happening anytime we processed pending softirqs anyway. Suggested-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Diffstat (limited to 'kernel/softirq.c')
-rw-r--r--kernel/softirq.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c
index f42ff97e1f8f..dce38fac4f32 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -334,9 +334,7 @@ static inline void invoke_softirq(void)
334void irq_exit(void) 334void irq_exit(void)
335{ 335{
336#ifndef __ARCH_IRQ_EXIT_IRQS_DISABLED 336#ifndef __ARCH_IRQ_EXIT_IRQS_DISABLED
337 unsigned long flags; 337 local_irq_disable();
338
339 local_irq_save(flags);
340#else 338#else
341 WARN_ON_ONCE(!irqs_disabled()); 339 WARN_ON_ONCE(!irqs_disabled());
342#endif 340#endif
@@ -353,9 +351,6 @@ void irq_exit(void)
353 tick_nohz_irq_exit(); 351 tick_nohz_irq_exit();
354#endif 352#endif
355 rcu_irq_exit(); 353 rcu_irq_exit();
356#ifndef __ARCH_IRQ_EXIT_IRQS_DISABLED
357 local_irq_restore(flags);
358#endif
359} 354}
360 355
361/* 356/*