mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-19 02:34:01 +08:00
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: Andy Lutomirski <luto@amacapital.net> Signed-off-by: Stefani Seibold <stefani@seibold.net> Link: http://lkml.kernel.org/r/1395094933-14252-6-git-send-email-stefani@seibold.net Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
This commit is contained in:
parent
ce39c64028
commit
af8c93d8d9
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user