diff --git a/[refs] b/[refs] index 4cc4d65c09a9..d92bf01fb1f8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: facd8b80c67a3cf64a467c4a2ac5fb31f2e6745b +refs/heads/master: af7bdbafe3812af406ce07631effd2b96aae2dba diff --git a/trunk/kernel/time/tick-sched.c b/trunk/kernel/time/tick-sched.c index 520592ab6aa4..314b9ee07edf 100644 --- a/trunk/kernel/time/tick-sched.c +++ b/trunk/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); } /**