Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 42847
b: refs/heads/master
c: cfd1893
h: refs/heads/master
i:
  42845: 71d9314
  42843: a70452e
  42839: 8389d7a
  42831: a8a4703
  42815: 5f72f0c
v: v3
  • Loading branch information
Thomas Gleixner authored and Linus Torvalds committed Dec 7, 2006
1 parent 1985050 commit cfdbfd3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 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: b46be05004abb419e303e66e143eed9f8a6e9f3f
refs/heads/master: cfd1893477fa94bb0915e39afa2f044ac978b5c6
4 changes: 2 additions & 2 deletions trunk/include/linux/ktime.h
Original file line number Diff line number Diff line change
Expand Up @@ -248,9 +248,9 @@ static inline struct timeval ktime_to_timeval(const ktime_t kt)
*
* Returns the scalar nanoseconds representation of kt
*/
static inline u64 ktime_to_ns(const ktime_t kt)
static inline s64 ktime_to_ns(const ktime_t kt)
{
return (u64) kt.tv.sec * NSEC_PER_SEC + kt.tv.nsec;
return (s64) kt.tv.sec * NSEC_PER_SEC + kt.tv.nsec;
}

#endif
Expand Down

0 comments on commit cfdbfd3

Please sign in to comment.