diff options
author | Tony Breeds <tony@bakeyournoodle.com> | 2008-02-07 17:24:52 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 17:54:45 -0500 |
commit | 151db1fc23800875c7ac353b106b7dab77061275 (patch) | |
tree | b14f06bec7e45c9cd909df1dfb66b099d273b35c /include/linux/ktime.h | |
parent | 145e9230760e4db27cf5f00fd04b005c79ca1c12 (diff) |
Fix compilation of powerpc asm-offsets.c with old gcc
Commit ad7f71674ad7c3c4467e48f6ab9e85516dae2720 ("[POWERPC] Use a
sensible default for clock_getres() in the VDSO") corrected the clock
resolution reported by the VDSO clock_getres() but introduced another
problem in that older versions of gcc (gcc-4.0 and earlier) fail to
compile the new code in arch/powerpc/kernel/asm-offsets.c.
This fixes it by introducing a new MONOTONIC_RES_NSEC define in the
generic code which is equivalent to KTIME_MONOTONIC_RES but is just an
integer constant, not a ktime union.
Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/ktime.h')
-rw-r--r-- | include/linux/ktime.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/ktime.h b/include/linux/ktime.h index a6ddec141f96..36c542b70c6d 100644 --- a/include/linux/ktime.h +++ b/include/linux/ktime.h | |||
@@ -316,7 +316,8 @@ static inline ktime_t ktime_sub_us(const ktime_t kt, const u64 usec) | |||
316 | * idea of the (in)accuracy of timers. Timer values are rounded up to | 316 | * idea of the (in)accuracy of timers. Timer values are rounded up to |
317 | * this resolution values. | 317 | * this resolution values. |
318 | */ | 318 | */ |
319 | #define KTIME_LOW_RES (ktime_t){ .tv64 = TICK_NSEC } | 319 | #define LOW_RES_NSEC TICK_NSEC |
320 | #define KTIME_LOW_RES (ktime_t){ .tv64 = LOW_RES_NSEC } | ||
320 | 321 | ||
321 | /* Get the monotonic time in timespec format: */ | 322 | /* Get the monotonic time in timespec format: */ |
322 | extern void ktime_get_ts(struct timespec *ts); | 323 | extern void ktime_get_ts(struct timespec *ts); |