diff --git a/[refs] b/[refs] index d54de2657602..20327608cceb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4f05b98d54b140ed3c5851d5d5156e9918c6305d +refs/heads/master: 782daeee3d596282bfee4cd9e976c86be0e194a8 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 629614ad0358..3995d1679858 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -858,7 +858,6 @@ void sched_clock_idle_wakeup_event(u64 delta_ns) struct rq *rq = cpu_rq(smp_processor_id()); u64 now = sched_clock(); - touch_softlockup_watchdog(); rq->idle_clock += delta_ns; /* * Override the previous timestamp and ignore all @@ -870,6 +869,7 @@ void sched_clock_idle_wakeup_event(u64 delta_ns) rq->prev_clock_raw = now; rq->clock += delta_ns; spin_unlock(&rq->lock); + touch_softlockup_watchdog(); } EXPORT_SYMBOL_GPL(sched_clock_idle_wakeup_event);