Revert "nohz: Make tick_nohz_irq_exit() irq safe"

[~andy/linux] / kernel / time / tick-sched.c

diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index 520592ab6aa4b1e6427b54c37714335f59557b56..314b9ee07edf076dcba956f064075ef9768e0422 100644 (file)
--- 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);
 }
 
 /**