diff --git a/[refs] b/[refs] index 759f05ffdc3a..d3d25299d792 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1c4cd6dd1d0fd3057bb6b8c87460049497889d1b +refs/heads/master: 02ff375590ac4140d88afc76505df1ad45c6af59 diff --git a/trunk/kernel/time/tick-sched.c b/trunk/kernel/time/tick-sched.c index b854a895591e..28abad66fc8e 100644 --- a/trunk/kernel/time/tick-sched.c +++ b/trunk/kernel/time/tick-sched.c @@ -133,8 +133,6 @@ void tick_nohz_update_jiffies(void) if (!ts->tick_stopped) return; - touch_softlockup_watchdog(); - cpu_clear(cpu, nohz_cpu_mask); now = ktime_get(); ts->idle_waketime = now; @@ -142,6 +140,8 @@ void tick_nohz_update_jiffies(void) local_irq_save(flags); tick_do_update_jiffies64(now); local_irq_restore(flags); + + touch_softlockup_watchdog(); } void tick_nohz_stop_idle(int cpu)