From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 30 Jul 2008 07:39:48 +0000 (+0200)
Subject: sched clock: clean up sched_clock_cpu()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=50526968e99afbca34924abcb04658b6dd5c5ea5;p=mv-sheeva.git

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 9a7844158ae..b96559cb96a 100644
--- 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 {