On Sun, Feb 2, 2014 at 3:27 AM, <stef...@seibold.net> wrote:
> From: Stefani Seibold <stef...@seibold.net>
>
> There a currently more than 30 users of the gtod macro, so replace the
> last VVAR(vsyscall_gtod_data) by gtod macro.
Acked-by: Andy Lutomirski <l...@amacapital.net>
>
> Signed-off-by: Stefani Seibold <stef...@seibold.net>
> ---
> arch/x86/vdso/vclock_gettime.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/x86/vdso/vclock_gettime.c b/arch/x86/vdso/vclock_gettime.c
> index fd074dd..743f277 100644
> --- a/arch/x86/vdso/vclock_gettime.c
> +++ b/arch/x86/vdso/vclock_gettime.c
> @@ -109,7 +109,7 @@ static notrace cycle_t vread_pvclock(int *mode)
> *mode = VCLOCK_NONE;
>
> /* refer to tsc.c read_tsc() comment for rationale */
> - last = VVAR(vsyscall_gtod_data).clock.cycle_last;
> + last = gtod->clock.cycle_last;
>
> if (likely(ret >= last))
> return ret;
> @@ -133,7 +133,7 @@ notrace static cycle_t vread_tsc(void)
> rdtsc_barrier();
> ret = (cycle_t)vget_cycles();
>
> - last = VVAR(vsyscall_gtod_data).clock.cycle_last;
> + last = gtod->clock.cycle_last;
>
> if (likely(ret >= last))
> return ret;
> @@ -288,7 +288,7 @@ int gettimeofday(struct timeval *, struct timezone *)
> notrace time_t __vdso_time(time_t *t)
> {
> /* This is atomic on x86_64 so we don't need any locks. */
> - time_t result = ACCESS_ONCE(VVAR(vsyscall_gtod_data).wall_time_sec);
> + time_t result = ACCESS_ONCE(gtod->wall_time_sec);
>
> if (t)
> *t = result;
> --
> 1.8.5.3
>
--
Andy Lutomirski
AMA Capital Management, LLC
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
