summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2006-12-06 20:37:38 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-07 08:39:37 -0800
commitcfd1893477fa94bb0915e39afa2f044ac978b5c6 (patch)
treeb21d67eb7445836eb48d5ed0944be827cbce4fbb
parentb46be05004abb419e303e66e143eed9f8a6e9f3f (diff)
downloadkernel-crypto-cfd1893477fa94bb0915e39afa2f044ac978b5c6.tar.gz
kernel-crypto-cfd1893477fa94bb0915e39afa2f044ac978b5c6.tar.xz
kernel-crypto-cfd1893477fa94bb0915e39afa2f044ac978b5c6.zip
[PATCH] ktime: Fix signed / unsigned mismatch in ktime_to_ns
The 32 bit implementation of ktime_to_ns returns unsigned value, while the 64 bit version correctly returns an signed value. There is no current user affected by this, but it has to be fixed, as ktime values can be negative. Pointed-out-by: Helmut Duregger <Helmut.Duregger@student.uibk.ac.at> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--include/linux/ktime.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/ktime.h b/include/linux/ktime.h
index 84eeecd60a0..611f17f79ee 100644
--- a/include/linux/ktime.h
+++ b/include/linux/ktime.h
@@ -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