git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
linux
/
ktime.h
diff --git
a/include/linux/ktime.h
b/include/linux/ktime.h
index
62bc575
..
84eeecd
100644
(file)
--- a/
include/linux/ktime.h
+++ b/
include/linux/ktime.h
@@
-56,7
+56,8
@@
typedef union {
#endif
} ktime_t;
#endif
} ktime_t;
-#define KTIME_MAX (~((u64)1 << 63))
+#define KTIME_MAX ((s64)~((u64)1 << 63))
+#define KTIME_SEC_MAX (KTIME_MAX / NSEC_PER_SEC)
/*
* ktime_t definitions when using the 64-bit scalar representation:
/*
* ktime_t definitions when using the 64-bit scalar representation:
@@
-66,7
+67,6
@@
typedef union {
/**
* ktime_set - Set a ktime_t variable from a seconds/nanoseconds value
/**
* ktime_set - Set a ktime_t variable from a seconds/nanoseconds value
- *
* @secs: seconds to set
* @nsecs: nanoseconds to set
*
* @secs: seconds to set
* @nsecs: nanoseconds to set
*
@@
-74,6
+74,10
@@
typedef union {
*/
static inline ktime_t ktime_set(const long secs, const unsigned long nsecs)
{
*/
static inline ktime_t ktime_set(const long secs, const unsigned long nsecs)
{
+#if (BITS_PER_LONG == 64)
+ if (unlikely(secs >= KTIME_SEC_MAX))
+ return (ktime_t){ .tv64 = KTIME_MAX };
+#endif
return (ktime_t) { .tv64 = (s64)secs * NSEC_PER_SEC + (s64)nsecs };
}
return (ktime_t) { .tv64 = (s64)secs * NSEC_PER_SEC + (s64)nsecs };
}
@@
-138,7
+142,6
@@
static inline ktime_t ktime_set(const long secs, const unsigned long nsecs)
/**
* ktime_sub - subtract two ktime_t variables
/**
* ktime_sub - subtract two ktime_t variables
- *
* @lhs: minuend
* @rhs: subtrahend
*
* @lhs: minuend
* @rhs: subtrahend
*
@@
-157,7
+160,6
@@
static inline ktime_t ktime_sub(const ktime_t lhs, const ktime_t rhs)
/**
* ktime_add - add two ktime_t variables
/**
* ktime_add - add two ktime_t variables
- *
* @add1: addend1
* @add2: addend2
*
* @add1: addend1
* @add2: addend2
*
@@
-184,7
+186,6
@@
static inline ktime_t ktime_add(const ktime_t add1, const ktime_t add2)
/**
* ktime_add_ns - Add a scalar nanoseconds value to a ktime_t variable
/**
* ktime_add_ns - Add a scalar nanoseconds value to a ktime_t variable
- *
* @kt: addend
* @nsec: the scalar nsec value to add
*
* @kt: addend
* @nsec: the scalar nsec value to add
*
@@
-194,7
+195,6
@@
extern ktime_t ktime_add_ns(const ktime_t kt, u64 nsec);
/**
* timespec_to_ktime - convert a timespec to ktime_t format
/**
* timespec_to_ktime - convert a timespec to ktime_t format
- *
* @ts: the timespec variable to convert
*
* Returns a ktime_t variable with the converted timespec value
* @ts: the timespec variable to convert
*
* Returns a ktime_t variable with the converted timespec value
@@
-207,7
+207,6
@@
static inline ktime_t timespec_to_ktime(const struct timespec ts)
/**
* timeval_to_ktime - convert a timeval to ktime_t format
/**
* timeval_to_ktime - convert a timeval to ktime_t format
- *
* @tv: the timeval variable to convert
*
* Returns a ktime_t variable with the converted timeval value
* @tv: the timeval variable to convert
*
* Returns a ktime_t variable with the converted timeval value
@@
-220,7
+219,6
@@
static inline ktime_t timeval_to_ktime(const struct timeval tv)
/**
* ktime_to_timespec - convert a ktime_t variable to timespec format
/**
* ktime_to_timespec - convert a ktime_t variable to timespec format
- *
* @kt: the ktime_t variable to convert
*
* Returns the timespec representation of the ktime value
* @kt: the ktime_t variable to convert
*
* Returns the timespec representation of the ktime value
@@
-233,7
+231,6
@@
static inline struct timespec ktime_to_timespec(const ktime_t kt)
/**
* ktime_to_timeval - convert a ktime_t variable to timeval format
/**
* ktime_to_timeval - convert a ktime_t variable to timeval format
- *
* @kt: the ktime_t variable to convert
*
* Returns the timeval representation of the ktime value
* @kt: the ktime_t variable to convert
*
* Returns the timeval representation of the ktime value