sched clock: clean up sched_clock_cpu()

- simplify the remote clock rebasing

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: Mike Galbraith <efault@gmx.de>

diff --git a/kernel/sched_clock.c b/kernel/sched_clock.c
index 9a7844158ae8b3b74b3e544405392aeea91b1063..b96559cb96a52153e27513a4fb7940e0fbfae8af 100644 (file)
--- a/kernel/sched_clock.c
+++ b/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 {