To: <vzlin-dev@sw.ru>
From: Konstantin Khlebnikov <khlebnikov@openvz.org>
Date: Tue, 22 Mar 2011 21:16:24 +0300
Message-ID: <20110322181624.6113.98302.stgit@localhost6>
User-Agent: StGit/0.15
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Cc: xemul@sw.ru
Subject: [vzlin-dev] [PATCH rh5] ms-vdso: disable gettimeofday for pm-timer
	clocksource
Precedence: list
Reply-To: vzlin-dev@lists.sw.ru
Sender: vzlin-dev-bounces@lists.sw.ru
Errors-To: vzlin-dev-bounces@lists.sw.ru
Content-Length: 1218

vdso-gettimeofday can't work with pm-timer clocksource.

https://jira.sw.ru/browse/PCLIN-28962

Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
---
 arch/x86_64/vdso/vclock_gettime.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86_64/vdso/vclock_gettime.c b/arch/x86_64/vdso/vclock_gettime.c
index d195db2..67791ea 100644
--- a/arch/x86_64/vdso/vclock_gettime.c
+++ b/arch/x86_64/vdso/vclock_gettime.c
@@ -105,7 +105,7 @@ static noinline int do_monotonic(struct timespec *ts)
 
 int __vdso_clock_gettime(clockid_t clock, struct timespec *ts)
 {
-	if (likely(vdso_sysctl_vsyscall && (vdso_vxtime->mode != VXTIME_KVM)))
+	if (likely(vdso_sysctl_vsyscall && (vdso_vxtime->mode < VXTIME_PMTMR)))
 		switch (clock) {
 		case CLOCK_REALTIME:
 			return do_realtime(ts);
@@ -121,7 +121,7 @@ int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz)
 {
 	long ret;
 
-	if (likely(vdso_sysctl_vsyscall && (vdso_vxtime->mode != VXTIME_KVM))) {
+	if (likely(vdso_sysctl_vsyscall && (vdso_vxtime->mode < VXTIME_PMTMR))) {
 		BUILD_BUG_ON(offsetof(struct timeval, tv_usec) !=
 			     offsetof(struct timespec, tv_nsec) ||
 			     sizeof(*tv) != sizeof(struct timespec));