diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2013-02-21 12:21:30 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2013-02-21 14:52:34 -0500 |
commit | af7bdbafe3812af406ce07631effd2b96aae2dba (patch) | |
tree | 4dddf6a7a5cbb9b04d1b0d04af1f25383e27fa19 /kernel | |
parent | facd8b80c67a3cf64a467c4a2ac5fb31f2e6745b (diff) |
Revert "nohz: Make tick_nohz_irq_exit() irq safe"
This reverts commit 351429b2e62b6545bb10c756686393f29ba268a1. The
extra local_irq_save() is not longer needed as the call site now
always calls with interrupts disabled.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Linus Torvalds <torvalds@linuxfoundation.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/time/tick-sched.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index 520592ab6aa4..314b9ee07edf 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c | |||
@@ -565,19 +565,14 @@ void tick_nohz_idle_enter(void) | |||
565 | */ | 565 | */ |
566 | void tick_nohz_irq_exit(void) | 566 | void tick_nohz_irq_exit(void) |
567 | { | 567 | { |
568 | unsigned long flags; | ||
569 | struct tick_sched *ts = &__get_cpu_var(tick_cpu_sched); | 568 | struct tick_sched *ts = &__get_cpu_var(tick_cpu_sched); |
570 | 569 | ||
571 | if (!ts->inidle) | 570 | if (!ts->inidle) |
572 | return; | 571 | return; |
573 | 572 | ||
574 | local_irq_save(flags); | 573 | /* Cancel the timer because CPU already waken up from the C-states*/ |
575 | |||
576 | /* Cancel the timer because CPU already waken up from the C-states */ | ||
577 | menu_hrtimer_cancel(); | 574 | menu_hrtimer_cancel(); |
578 | __tick_nohz_idle_enter(ts); | 575 | __tick_nohz_idle_enter(ts); |
579 | |||
580 | local_irq_restore(flags); | ||
581 | } | 576 | } |
582 | 577 | ||
583 | /** | 578 | /** |