diff --git a/[refs] b/[refs] index fe675ea7dace..c34d16db46ed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4e4e534faa3c2be4e165ce414f44b76ada7208c +refs/heads/master: 50526968e99afbca34924abcb04658b6dd5c5ea5 diff --git a/trunk/kernel/sched_clock.c b/trunk/kernel/sched_clock.c index 9a7844158ae8..b96559cb96a5 100644 --- a/trunk/kernel/sched_clock.c +++ b/trunk/kernel/sched_clock.c @@ -169,11 +169,8 @@ u64 sched_clock_cpu(int cpu) lock_double_clock(scd, my_scd); - now -= my_scd->tick_raw; - now += scd->tick_raw; - - now += my_scd->tick_gtod; - now -= scd->tick_gtod; + now += scd->tick_raw - my_scd->tick_raw; + now += my_scd->tick_gtod - scd->tick_gtod; __raw_spin_unlock(&my_scd->lock); } else {