From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcelo Tosatti Subject: [patch 11/18] x86: vsyscall: pass mode to gettime backend Date: Wed, 24 Oct 2012 11:13:51 -0200 Message-ID: <20121024131621.792772220@redhat.com> References: <20121024131340.742340256@redhat.com> Cc: johnstul@us.ibm.com, jeremy@goop.org, glommer@parallels.com, zamsden@gmail.com, gleb@redhat.com, avi@redhat.com, pbonzini@redhat.com, Marcelo Tosatti To: kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:54950 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756460Ab2JXNQ6 (ORCPT ); Wed, 24 Oct 2012 09:16:58 -0400 Content-Disposition: inline; filename=09-vclock-gettime-return-mode Sender: kvm-owner@vger.kernel.org List-ID: Required by next patch. Signed-off-by: Marcelo Tosatti Index: vsyscall/arch/x86/vdso/vclock_gettime.c =================================================================== --- vsyscall.orig/arch/x86/vdso/vclock_gettime.c +++ vsyscall/arch/x86/vdso/vclock_gettime.c @@ -80,7 +80,7 @@ notrace static long vdso_fallback_gtod(s } -notrace static inline u64 vgetsns(void) +notrace static inline u64 vgetsns(int *mode) { long v; cycles_t cycles; @@ -107,7 +107,7 @@ notrace static int __always_inline do_re mode = gtod->clock.vclock_mode; ts->tv_sec = gtod->wall_time_sec; ns = gtod->wall_time_snsec; - ns += vgetsns(); + ns += vgetsns(&mode); ns >>= gtod->clock.shift; } while (unlikely(read_seqcount_retry(>od->seq, seq))); @@ -127,7 +127,7 @@ notrace static int do_monotonic(struct t mode = gtod->clock.vclock_mode; ts->tv_sec = gtod->monotonic_time_sec; ns = gtod->monotonic_time_snsec; - ns += vgetsns(); + ns += vgetsns(&mode); ns >>= gtod->clock.shift; } while (unlikely(read_seqcount_retry(>od->seq, seq))); timespec_add_ns(ts, ns);