Commit 782daeee authored Jan 25, 2008 by Guillaume Chazarain Committed by Ingo Molnar Jan 25, 2008

sched: fix rq->clock warps on frequency changes



sched: fix rq->clock warps on frequency changes

Fix 2bacec8c
(sched: touch softlockup watchdog after idling) that reintroduced warps
on frequency changes. touch_softlockup_watchdog() calls __update_rq_clock
that checks rq->clock for warps, so call it after adjusting rq->clock.

Signed-off-by: Guillaume Chazarain <guichaz@yahoo.fr>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent 4f05b98d

kernel/sched.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);