Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 176592
b: refs/heads/master
c: f065f41
h: refs/heads/master
v: v3
  • Loading branch information
Barry Song authored and Linus Torvalds committed Dec 16, 2009
1 parent ec933c0 commit 7c0b8ae
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4365a5676fa3aa1d5ae6c90c22a0044f09ba584e
refs/heads/master: f065f41f48569122b5bcddbd1ba2354f7cc29fdc
2 changes: 1 addition & 1 deletion trunk/kernel/time/timecompare.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit 7c0b8ae

Please sign in to comment.