Merge master.kernel.org:/home/rmk/linux-2.6-arm

[powerpc.git] / include / linux / ktime.h

diff --git a/include/linux/ktime.h b/include/linux/ktime.h
index 248305b..c762954 100644 (file)
--- a/include/linux/ktime.h
+++ b/include/linux/ktime.h
@@ -43,7 +43,7 @@
  * plain scalar nanosecond based representation can be selected by the
  * config switch CONFIG_KTIME_SCALAR.
  */
-typedef union {
+union ktime {
        s64     tv64;
 #if BITS_PER_LONG != 64 && !defined(CONFIG_KTIME_SCALAR)
        struct {
@@ -54,7 +54,9 @@ typedef union {
 # endif
        } tv;
 #endif
-} ktime_t;
+};
+
+typedef union ktime ktime_t;           /* Kill this */
 
 #define KTIME_MAX                      ((s64)~((u64)1 << 63))
 #if (BITS_PER_LONG == 64)
@@ -259,6 +261,12 @@ static inline s64 ktime_to_ns(const ktime_t kt)
 
 #endif
 
+static inline s64 ktime_to_us(const ktime_t kt)
+{
+       struct timeval tv = ktime_to_timeval(kt);
+       return (s64) tv.tv_sec * USEC_PER_SEC + tv.tv_usec;
+}
+
 /*
  * The resolution of the clocks. The resolution value is returned in
  * the clock_getres() system call to give application programmers an