---

yaml --- r: 251985 b: refs/heads/master c: 973aa81 h: refs/heads/master i: 251983: 8c3760c v: v3
git-mirror · May 24, 2011 · a06feae · a06feae
1 parent ea0a281
commit a06feae
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git 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
@@ -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;