diff options
Diffstat (limited to 'arch/x86_64/vdso')
-rw-r--r-- | arch/x86_64/vdso/vclock_gettime.c | 5 | ||||
-rw-r--r-- | arch/x86_64/vdso/voffset.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86_64/vdso/vclock_gettime.c b/arch/x86_64/vdso/vclock_gettime.c index 17f6a00de712..5b54cdfb2b07 100644 --- a/arch/x86_64/vdso/vclock_gettime.c +++ b/arch/x86_64/vdso/vclock_gettime.c | |||
@@ -34,10 +34,11 @@ static long vdso_fallback_gettime(long clock, struct timespec *ts) | |||
34 | 34 | ||
35 | static inline long vgetns(void) | 35 | static inline long vgetns(void) |
36 | { | 36 | { |
37 | long v; | ||
37 | cycles_t (*vread)(void); | 38 | cycles_t (*vread)(void); |
38 | vread = gtod->clock.vread; | 39 | vread = gtod->clock.vread; |
39 | return ((vread() - gtod->clock.cycle_last) * gtod->clock.mult) >> | 40 | v = (vread() - gtod->clock.cycle_last) & gtod->clock.mask; |
40 | gtod->clock.shift; | 41 | return (v * gtod->clock.mult) >> gtod->clock.shift; |
41 | } | 42 | } |
42 | 43 | ||
43 | static noinline int do_realtime(struct timespec *ts) | 44 | static noinline int do_realtime(struct timespec *ts) |
diff --git a/arch/x86_64/vdso/voffset.h b/arch/x86_64/vdso/voffset.h index 5304204911f2..4af67c79085f 100644 --- a/arch/x86_64/vdso/voffset.h +++ b/arch/x86_64/vdso/voffset.h | |||
@@ -1 +1 @@ | |||
#define VDSO_TEXT_OFFSET 0x500 | #define VDSO_TEXT_OFFSET 0x600 | ||