From a06feae08eb7dc3ba4a890ee5202eebc1038e779 Mon Sep 17 00:00:00 2001 From: Andy Lutomirski Date: Mon, 23 May 2011 09:31:31 -0400 Subject: [PATCH] --- yaml --- r: 251985 b: refs/heads/master c: 973aa8181e10050809b56ecbaadd01495766a19e h: refs/heads/master i: 251983: 8c3760ccfbad09caa612f25dd9ff2a10af55dd12 v: v3 --- [refs] | 2 +- trunk/arch/x86/vdso/vclock_gettime.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index ae7554b1cfbd..bfa1bdf7f317 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f144a6b4d1688675d88990e29567b2335b48205e +refs/heads/master: 973aa8181e10050809b56ecbaadd01495766a19e diff --git a/trunk/arch/x86/vdso/vclock_gettime.c b/trunk/arch/x86/vdso/vclock_gettime.c index e6e9f90a8cd7..a69929e8bfdb 100644 --- a/trunk/arch/x86/vdso/vclock_gettime.c +++ b/trunk/arch/x86/vdso/vclock_gettime.c @@ -180,12 +180,8 @@ notrace time_t __vdso_time(time_t *t) if (unlikely(!VVAR(vsyscall_gtod_data).sysctl_enabled)) return time_syscall(t); - do { - seq = read_seqbegin(&VVAR(vsyscall_gtod_data).lock); - - result = VVAR(vsyscall_gtod_data).wall_time_sec; - - } while (read_seqretry(&VVAR(vsyscall_gtod_data).lock, seq)); + /* This is atomic on x86_64 so we don't need any locks. */ + result = ACCESS_ONCE(VVAR(vsyscall_gtod_data).wall_time_sec); if (t) *t = result;