From d6b1589fb89553618d5b41923a3ac466f2167160 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 30 Jul 2008 09:39:48 +0200
Subject: [PATCH] --- yaml --- r: 108207 b: refs/heads/master c:
 50526968e99afbca34924abcb04658b6dd5c5ea5 h: refs/heads/master i:   108205:
 2030fdc28d22d00a5a47937a835b80580a2c1489   108203:
 443bc9a4de66fe5a8902142c5f62e26d77b03a6c   108199:
 26f73512717cd73cc81af6263cd736af6a07694c   108191:
 3bfe58b2628dcda29d238f71e0625d74e4b3dba2 v: v3

---
 [refs]                     | 2 +-
 trunk/kernel/sched_clock.c | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

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 {