git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[safe/jmp/linux-2.6]
/
kernel
/
time
/
timecompare.c
diff --git
a/kernel/time/timecompare.c
b/kernel/time/timecompare.c
index
96ff643
..
12f5c55
100644
(file)
--- a/
kernel/time/timecompare.c
+++ b/
kernel/time/timecompare.c
@@
-89,7
+89,7
@@
int timecompare_offset(struct timecompare *sync,
* source time
*/
sample.offset =
-
ktime_to_ns(ktime_add(end,
start)) / 2 -
+
(ktime_to_ns(end) + ktime_to_ns(
start)) / 2 -
ts;
/* simple insertion sort based on duration */