aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-30 03:39:48 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-31 11:20:42 -0400
commit50526968e99afbca34924abcb04658b6dd5c5ea5 (patch)
tree694bf4fae96efb10261e9a30514adf052d994360 /kernel
parente4e4e534faa3c2be4e165ce414f44b76ada7208c (diff)
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>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched_clock.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/kernel/sched_clock.c b/kernel/sched_clock.c
index 9a7844158ae8..b96559cb96a5 100644
--- a/kernel/sched_clock.c
+++ b/kernel/sched_clock.c
@@ -169,11 +169,8 @@ u64 sched_clock_cpu(int cpu)
169 169
170 lock_double_clock(scd, my_scd); 170 lock_double_clock(scd, my_scd);
171 171
172 now -= my_scd->tick_raw; 172 now += scd->tick_raw - my_scd->tick_raw;
173 now += scd->tick_raw; 173 now += my_scd->tick_gtod - scd->tick_gtod;
174
175 now += my_scd->tick_gtod;
176 now -= scd->tick_gtod;
177 174
178 __raw_spin_unlock(&my_scd->lock); 175 __raw_spin_unlock(&my_scd->lock);
179 } else { 176 } else {