diff options
author | Roman Zippel <zippel@linux-m68k.org> | 2006-03-26 04:38:10 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-26 11:57:03 -0500 |
commit | 272705c5979c114e63dbfcd28ea15093038a4c42 (patch) | |
tree | f23449f399cc6a693e6f7c26c4dfcce212381a20 | |
parent | 4dee26b7e26eb3c78da8bf6c1c52ee5419145b28 (diff) |
[PATCH] hrtimers: remove DEFINE_KTIME and ktime_to_clock_t()
Now that it_real_value is gone, the last user of DEFINE_KTIME and
ktime_to_clock_t are also gone, so remove it before someone starts using it
again.
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Acked-by: Ingo Molnar <mingo@elte.hu>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | include/linux/ktime.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/include/linux/ktime.h b/include/linux/ktime.h index f3dec45ef874..62bc57580707 100644 --- a/include/linux/ktime.h +++ b/include/linux/ktime.h | |||
@@ -64,9 +64,6 @@ typedef union { | |||
64 | 64 | ||
65 | #if (BITS_PER_LONG == 64) || defined(CONFIG_KTIME_SCALAR) | 65 | #if (BITS_PER_LONG == 64) || defined(CONFIG_KTIME_SCALAR) |
66 | 66 | ||
67 | /* Define a ktime_t variable and initialize it to zero: */ | ||
68 | #define DEFINE_KTIME(kt) ktime_t kt = { .tv64 = 0 } | ||
69 | |||
70 | /** | 67 | /** |
71 | * ktime_set - Set a ktime_t variable from a seconds/nanoseconds value | 68 | * ktime_set - Set a ktime_t variable from a seconds/nanoseconds value |
72 | * | 69 | * |
@@ -113,9 +110,6 @@ static inline ktime_t timeval_to_ktime(struct timeval tv) | |||
113 | /* Map the ktime_t to timeval conversion to ns_to_timeval function */ | 110 | /* Map the ktime_t to timeval conversion to ns_to_timeval function */ |
114 | #define ktime_to_timeval(kt) ns_to_timeval((kt).tv64) | 111 | #define ktime_to_timeval(kt) ns_to_timeval((kt).tv64) |
115 | 112 | ||
116 | /* Map the ktime_t to clock_t conversion to the inline in jiffies.h: */ | ||
117 | #define ktime_to_clock_t(kt) nsec_to_clock_t((kt).tv64) | ||
118 | |||
119 | /* Convert ktime_t to nanoseconds - NOP in the scalar storage format: */ | 113 | /* Convert ktime_t to nanoseconds - NOP in the scalar storage format: */ |
120 | #define ktime_to_ns(kt) ((kt).tv64) | 114 | #define ktime_to_ns(kt) ((kt).tv64) |
121 | 115 | ||
@@ -136,9 +130,6 @@ static inline ktime_t timeval_to_ktime(struct timeval tv) | |||
136 | * tv.sec < 0 and 0 >= tv.nsec < NSEC_PER_SEC | 130 | * tv.sec < 0 and 0 >= tv.nsec < NSEC_PER_SEC |
137 | */ | 131 | */ |
138 | 132 | ||
139 | /* Define a ktime_t variable and initialize it to zero: */ | ||
140 | #define DEFINE_KTIME(kt) ktime_t kt = { .tv64 = 0 } | ||
141 | |||
142 | /* Set a ktime_t variable to a value in sec/nsec representation: */ | 133 | /* Set a ktime_t variable to a value in sec/nsec representation: */ |
143 | static inline ktime_t ktime_set(const long secs, const unsigned long nsecs) | 134 | static inline ktime_t ktime_set(const long secs, const unsigned long nsecs) |
144 | { | 135 | { |
@@ -255,17 +246,6 @@ static inline struct timeval ktime_to_timeval(const ktime_t kt) | |||
255 | } | 246 | } |
256 | 247 | ||
257 | /** | 248 | /** |
258 | * ktime_to_clock_t - convert a ktime_t variable to clock_t format | ||
259 | * @kt: the ktime_t variable to convert | ||
260 | * | ||
261 | * Returns a clock_t variable with the converted value | ||
262 | */ | ||
263 | static inline clock_t ktime_to_clock_t(const ktime_t kt) | ||
264 | { | ||
265 | return nsec_to_clock_t( (u64) kt.tv.sec * NSEC_PER_SEC + kt.tv.nsec); | ||
266 | } | ||
267 | |||
268 | /** | ||
269 | * ktime_to_ns - convert a ktime_t variable to scalar nanoseconds | 249 | * ktime_to_ns - convert a ktime_t variable to scalar nanoseconds |
270 | * @kt: the ktime_t variable to convert | 250 | * @kt: the ktime_t variable to convert |
271 | * | 251 | * |