linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / linux / time.h

diff --git a/include/linux/time.h b/include/linux/time.h
index 0cd696c..d9cdba5 100644 (file)
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -73,6 +73,12 @@ extern void set_normalized_timespec(struct timespec *ts, time_t sec, long nsec);
 #define timespec_valid(ts) \
        (((ts)->tv_sec >= 0) && (((unsigned long) (ts)->tv_nsec) < NSEC_PER_SEC))
 
+/*
+ * 64-bit nanosec type. Large enough to span 292+ years in nanosecond
+ * resolution. Ought to be enough for a while.
+ */
+typedef s64 nsec_t;
+
 extern struct timespec xtime;
 extern struct timespec wall_to_monotonic;
 extern seqlock_t xtime_lock;
@@ -95,7 +101,6 @@ extern long do_utimes(int dfd, char __user *filename, struct timeval *times);
 struct itimerval;
 extern int do_setitimer(int which, struct itimerval *value,
                        struct itimerval *ovalue);
-extern unsigned int alarm_setitimer(unsigned int seconds);
 extern int do_getitimer(int which, struct itimerval *value);
 extern void getnstimeofday(struct timespec *tv);
 
@@ -108,9 +113,9 @@ extern struct timespec timespec_trunc(struct timespec t, unsigned gran);
  * Returns the scalar nanosecond representation of the timespec
  * parameter.
  */
-static inline s64 timespec_to_ns(const struct timespec *ts)
+static inline nsec_t timespec_to_ns(const struct timespec *ts)
 {
-       return ((s64) ts->tv_sec * NSEC_PER_SEC) + ts->tv_nsec;
+       return ((nsec_t) ts->tv_sec * NSEC_PER_SEC) + ts->tv_nsec;
 }
 
 /**
@@ -120,9 +125,9 @@ static inline s64 timespec_to_ns(const struct timespec *ts)
  * Returns the scalar nanosecond representation of the timeval
  * parameter.
  */
-static inline s64 timeval_to_ns(const struct timeval *tv)
+static inline nsec_t timeval_to_ns(const struct timeval *tv)
 {
-       return ((s64) tv->tv_sec * NSEC_PER_SEC) +
+       return ((nsec_t) tv->tv_sec * NSEC_PER_SEC) +
                tv->tv_usec * NSEC_PER_USEC;
 }
 
@@ -132,7 +137,7 @@ static inline s64 timeval_to_ns(const struct timeval *tv)
  *
  * Returns the timespec representation of the nsec parameter.
  */
-extern struct timespec ns_to_timespec(const s64 nsec);
+extern struct timespec ns_to_timespec(const nsec_t nsec);
 
 /**
  * ns_to_timeval - Convert nanoseconds to timeval
@@ -140,7 +145,7 @@ extern struct timespec ns_to_timespec(const s64 nsec);
  *
  * Returns the timeval representation of the nsec parameter.
  */
-extern struct timeval ns_to_timeval(const s64 nsec);
+extern struct timeval ns_to_timeval(const nsec_t nsec);
 
 #endif /* __KERNEL__ */