From a70c45d3c9336532e324d8a619f6b66bfa06cdd0 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <rostedt@goodmis.org>
Date: Mon, 7 Jul 2008 19:49:41 -0400
Subject: [PATCH] --- yaml --- r: 100255 b: refs/heads/master c:
 2b8a0cf4890d7537a77b51caa8f508e4a05a0e67 h: refs/heads/master i:   100253:
 0cd90809921d188fa27a49d527f4ccb76f8a165c   100251:
 62c2d3adfc9aeee9e1268dba530592e37da7f285   100247:
 ee0b5a744f89c1a452e1bd4adfd884938971dd2c   100239:
 cd9515bb7fa1d3f3e5cc495ddb3cbb78fc088096   100223:
 9482a587ecb401a48d417fa3591505b2e12ffe7d v: v3

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

diff --git a/[refs] b/[refs]
index f62f3f6855ce..b68889a5e100 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af52a90a14cdaa54ecbfb6e6982abb13466a4b56
+refs/heads/master: 2b8a0cf4890d7537a77b51caa8f508e4a05a0e67
diff --git a/trunk/kernel/sched_clock.c b/trunk/kernel/sched_clock.c
index 97159e225a77..55fca1e9e12a 100644
--- a/trunk/kernel/sched_clock.c
+++ b/trunk/kernel/sched_clock.c
@@ -203,8 +203,8 @@ u64 sched_clock_cpu(int cpu)
 		now -= my_scd->tick_raw;
 		now += scd->tick_raw;
 
-		now -= my_scd->tick_gtod;
-		now += scd->tick_gtod;
+		now += my_scd->tick_gtod;
+		now -= scd->tick_gtod;
 
 		__raw_spin_unlock(&my_scd->lock);
 	} else {