From 2035fb4c8806b60ad795b9bbbef9974725af258b Mon Sep 17 00:00:00 2001
From: john stultz <johnstul@us.ibm.com>
Date: Mon, 21 May 2007 14:31:52 +0200
Subject: [PATCH] --- yaml --- r: 56675 b: refs/heads/master c:
 d0aff6e6f4e54f79f9c89d147d371bad384454e9 h: refs/heads/master i:   56673:
 90fc7df7f2f520d86a00d4a6b2e8d5ffedae0968   56671:
 12a38569f09d266845328c4fbd395c10ae4a372d v: v3

---
 [refs]                              | 2 +-
 trunk/arch/x86_64/kernel/vsyscall.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2898a38d6133..ddb2e73f44ae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8902bfcacde6001e1b11bb06137c3bae3ae52d0
+refs/heads/master: d0aff6e6f4e54f79f9c89d147d371bad384454e9
diff --git a/trunk/arch/x86_64/kernel/vsyscall.c b/trunk/arch/x86_64/kernel/vsyscall.c
index 51d4c6fa88c8..57660d58d500 100644
--- a/trunk/arch/x86_64/kernel/vsyscall.c
+++ b/trunk/arch/x86_64/kernel/vsyscall.c
@@ -175,10 +175,13 @@ int __vsyscall(0) vgettimeofday(struct timeval * tv, struct timezone * tz)
  * unlikely */
 time_t __vsyscall(1) vtime(time_t *t)
 {
+	struct timeval tv;
 	time_t result;
 	if (unlikely(!__vsyscall_gtod_data.sysctl_enabled))
 		return time_syscall(t);
-	result = __vsyscall_gtod_data.wall_time_sec;
+
+	vgettimeofday(&tv, 0);
+	result = tv.tv_sec;
 	if (t)
 		*t = result;
 	return result;