aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gleixner <[email protected]>2013-02-21 18:21:30 +0100
committerThomas Gleixner <[email protected]>2013-02-21 20:52:34 +0100
commitaf7bdbafe3812af406ce07631effd2b96aae2dba (patch)
tree4dddf6a7a5cbb9b04d1b0d04af1f25383e27fa19
parentfacd8b80c67a3cf64a467c4a2ac5fb31f2e6745b (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 <[email protected]> Cc: Frederic Weisbecker <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Paul E. McKenney <[email protected]> Cc: Linus Torvalds <[email protected]>
-rw-r--r--kernel/time/tick-sched.c7
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)
*/
void tick_nohz_irq_exit(void)
{
- unsigned long flags;
struct tick_sched *ts = &__get_cpu_var(tick_cpu_sched);
if (!ts->inidle)
return;
- local_irq_save(flags);
-
- /* Cancel the timer because CPU already waken up from the C-states */
+ /* Cancel the timer because CPU already waken up from the C-states*/
menu_hrtimer_cancel();
__tick_nohz_idle_enter(ts);
-
- local_irq_restore(flags);
}
/**