Fix powerpc vdso clock_getres().
Subsystems (2)
PATCH 1/1 Fix powerpc vdso clock_getres().
Since implementing highres timers on powerpc the clock_getres syscall has reported different resolutions due to the vdso using the a low res value. In the patch d7f71674ad7c3c4467e48f6ab9e85516dae2720 ([POWERPC] Use a sensible default for clock_getres() in the VDSO), the powerpc vdso was updated to use the correct value.
This fix doesn't work on older compilers. Below is a fix for powerpc, that introduces a new (generic) #define MONOTONIC_RES_NSEC which is equal to the 64 value stored in KTIME_MONOTONIC_RES.
---
Thomas, If this is okay with you can it go through Paul's tree?
arch/powerpc/kernel/asm-offsets.c | 2 +- include/linux/hrtimer.h | 5 ++++- include/linux/ktime.h | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-)
arch/powerpc/kernel/asm-offsets.c +1 -1
@@ -313,7 +313,7 @@ int main(void)DEFINE (CLOCK_REALTIME ,CLOCK_REALTIME );DEFINE (CLOCK_MONOTONIC ,CLOCK_MONOTONIC );DEFINE (NSEC_PER_SEC ,NSEC_PER_SEC ); -DEFINE (CLOCK_REALTIME_RES , (KTIME_MONOTONIC_RES ).tv64); +DEFINE (CLOCK_REALTIME_RES ,MONOTONIC_RES_NSEC );#ifdef CONFIG_BUG DEFINE (BUG_ENTRY_SIZE ,sizeof (struct bug_entry ));
include/linux/hrtimer.h +4 -1
@@ -223,11 +223,14 @@ static inline ktime_t hrtimer_cb_get_time(struct hrtimer *timer)* idea of the (in)accuracy of timers. Timer values are rounded up to * this resolution values. */ -# define KTIME_HIGH_RES (ktime_t) { .tv64 = 1 } +# define HIGH_RES_NSEC 1 +# define KTIME_HIGH_RES (ktime_t) { .tv64 = HIGH_RES_NSEC } +# define MONOTONIC_RES_NSEC HIGH_RES_NSEC# define KTIME_MONOTONIC_RES KTIME_HIGH_RES#else +# define MONOTONIC_RES_NSEC LOW_RES_NSEC# define KTIME_MONOTONIC_RES KTIME_LOW_RES/*
include/linux/ktime.h +2 -1
@@ -316,7 +316,8 @@ static inline ktime_t ktime_sub_us(const ktime_t kt, const u64 usec)* idea of the (in)accuracy of timers. Timer values are rounded up to * this resolution values. */ -#define KTIME_LOW_RES (ktime_t){ .tv64 = TICK_NSEC } +#define LOW_RES_NSEC TICK_NSEC +#define KTIME_LOW_RES (ktime_t){ .tv64 = LOW_RES_NSEC }/* Get the monotonic time in timespec format: */ extern void ktime_get_ts (struct timespec *ts);
Yours Tony
linux.conf.au http://linux.conf.au/ || http://lca2008.linux.org.au/
Jan 28 - Feb 02 2008 The Australian Linux Technical Conference!
Quoted 9 lines · Tony Breeds
Since implementing highres timers on powerpc the
clock_getressyscall
has reported different resolutions due to the vdso using the a low res
value. In the patchd7f71674ad7c3c4467e48f6ab9e85516dae2720([POWERPC] Use a sensible default forclock_getres()in the VDSO), the powerpc vdso was updated to use the correct value.This fix doesn't work on older compilers. Below is a fix for powerpc, that introduces a new (generic) #define
MONOTONIC_RES_NSECwhich is equal to the 64 value stored inKTIME_MONOTONIC_RES.
Just a confirmation that this patch fixed my compile issue. And I was using gcc-4.0.0.
Thanks,
Sean