diff --git a/[refs] b/[refs] index 9d893f5d068a..4c01648062a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 73c4efd2c88a41c8a4810904266a34423b5584e5 +refs/heads/master: 2bacec8c318ca0418c0ee9ac662ee44207765dd4 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 5ae0d4296e7c..3df84ea6aba9 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -668,6 +668,7 @@ 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