Commit af8c93d8 authored by Stefani Seibold's avatar Stefani Seibold Committed by H. Peter Anvin

x86, vdso: Replace VVAR(vsyscall_gtod_data) by gtod macro

There a currently more than 30 users of the gtod macro, so replace the
last VVAR(vsyscall_gtod_data) by gtod macro.
Reviewed-by: default avatarAndy Lutomirski <luto@amacapital.net>
Signed-off-by: default avatarStefani Seibold <stefani@seibold.net>
Link: http://lkml.kernel.org/r/1395094933-14252-6-git-send-email-stefani@seibold.netSigned-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent ce39c640
...@@ -109,7 +109,7 @@ static notrace cycle_t vread_pvclock(int *mode) ...@@ -109,7 +109,7 @@ static notrace cycle_t vread_pvclock(int *mode)
*mode = VCLOCK_NONE; *mode = VCLOCK_NONE;
/* refer to tsc.c read_tsc() comment for rationale */ /* 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)) if (likely(ret >= last))
return ret; return ret;
...@@ -133,7 +133,7 @@ notrace static cycle_t vread_tsc(void) ...@@ -133,7 +133,7 @@ notrace static cycle_t vread_tsc(void)
rdtsc_barrier(); rdtsc_barrier();
ret = (cycle_t)vget_cycles(); ret = (cycle_t)vget_cycles();
last = VVAR(vsyscall_gtod_data).clock.cycle_last; last = gtod->clock.cycle_last;
if (likely(ret >= last)) if (likely(ret >= last))
return ret; return ret;
...@@ -288,7 +288,7 @@ int gettimeofday(struct timeval *, struct timezone *) ...@@ -288,7 +288,7 @@ int gettimeofday(struct timeval *, struct timezone *)
notrace time_t __vdso_time(time_t *t) notrace time_t __vdso_time(time_t *t)
{ {
/* This is atomic on x86_64 so we don't need any locks. */ /* 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) if (t)
*t = result; *t = result;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment