---

yaml --- r: 108207 b: refs/heads/master c: 5052696 h: refs/heads/master i: 108205: 2030fdc 108203: 443bc9a 108199: 26f7351 108191: 3bfe58b v: v3
git-mirror · Jul 31, 2008 · d6b1589 · d6b1589
1 parent fe90921
commit d6b1589
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git 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
@@ -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 {