linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stefani Seibold <stefani@seibold.net>
To: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org,
	x86@kernel.org, tglx@linutronix.de, mingo@redhat.com,
	hpa@zytor.com, ak@linux.intel.com, aarcange@redhat.com,
	john.stultz@linaro.org, luto@amacapital.net, xemul@parallels.com,
	gorcunov@openvz.org, andriy.shevchenko@linux.intel.com
Cc: Martin.Runge@rohde-schwarz.com, Andreas.Brief@rohde-schwarz.com,
	Stefani Seibold <stefani@seibold.net>
Subject: [PATCH v21 05/12] replace VVAR(vsyscall_gtod_data) by gtod macro
Date: Sun,  2 Mar 2014 10:20:13 +0100	[thread overview]
Message-ID: <1393752020-6740-6-git-send-email-stefani@seibold.net> (raw)
In-Reply-To: <1393752020-6740-1-git-send-email-stefani@seibold.net>

There a currently more than 30 users of the gtod macro, so replace the
last VVAR(vsyscall_gtod_data) by gtod macro.

Signed-off-by: Stefani Seibold <stefani@seibold.net>
---
 arch/x86/vdso/vclock_gettime.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/vdso/vclock_gettime.c b/arch/x86/vdso/vclock_gettime.c
index fd074dd..743f277 100644
--- a/arch/x86/vdso/vclock_gettime.c
+++ b/arch/x86/vdso/vclock_gettime.c
@@ -109,7 +109,7 @@ static notrace cycle_t vread_pvclock(int *mode)
 		*mode = VCLOCK_NONE;
 
 	/* refer to tsc.c read_tsc() comment for rationale */
-	last = VVAR(vsyscall_gtod_data).clock.cycle_last;
+	last = gtod->clock.cycle_last;
 
 	if (likely(ret >= last))
 		return ret;
@@ -133,7 +133,7 @@ notrace static cycle_t vread_tsc(void)
 	rdtsc_barrier();
 	ret = (cycle_t)vget_cycles();
 
-	last = VVAR(vsyscall_gtod_data).clock.cycle_last;
+	last = gtod->clock.cycle_last;
 
 	if (likely(ret >= last))
 		return ret;
@@ -288,7 +288,7 @@ int gettimeofday(struct timeval *, struct timezone *)
 notrace time_t __vdso_time(time_t *t)
 {
 	/* This is atomic on x86_64 so we don't need any locks. */
-	time_t result = ACCESS_ONCE(VVAR(vsyscall_gtod_data).wall_time_sec);
+	time_t result = ACCESS_ONCE(gtod->wall_time_sec);
 
 	if (t)
 		*t = result;
-- 
1.9.0


  parent reply	other threads:[~2014-03-02  9:22 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-02  9:20 [PATCH v21 00/12] Add 32 bit VDSO time function support Stefani Seibold
2014-03-02  9:20 ` [PATCH v21 01/12] Make vsyscall_gtod_data handling x86 generic Stefani Seibold
2014-03-02  9:20 ` [PATCH v21 02/12] Add new func _install_special_mapping() to mmap.c Stefani Seibold
2014-03-02  9:20 ` [PATCH v21 03/12] revamp vclock_gettime.c Stefani Seibold
2014-03-02  9:20 ` [PATCH v21 04/12] vclock_gettime.c __vdso_clock_gettime cleanup Stefani Seibold
2014-03-02  9:20 ` Stefani Seibold [this message]
2014-03-02  9:20 ` [PATCH v21 06/12] cleanup __vdso_gettimeofday Stefani Seibold
2014-03-02  9:20 ` [PATCH v21 07/12] introduce VVAR marco for vdso32 Stefani Seibold
2014-03-02  9:20 ` [PATCH v21 08/12] Patch alternatives in the 32-bit vDSO Stefani Seibold
2014-03-02  9:20 ` [PATCH v21 09/12] Add 32 bit VDSO time support for 32 bit kernel Stefani Seibold
2014-03-02  9:20 ` [PATCH v21 10/12] Add 32 bit VDSO time support for 64 " Stefani Seibold
2014-03-02  9:20 ` [PATCH v21 12/12] x86: Zero-pad the VVAR page Stefani Seibold
2014-03-02 10:46   ` Ingo Molnar
2014-03-02 10:47 ` [PATCH v21 00/12] Add 32 bit VDSO time function support Ingo Molnar
2014-03-02 16:32   ` Andy Lutomirski
2014-03-02 21:02     ` H. Peter Anvin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1393752020-6740-6-git-send-email-stefani@seibold.net \
    --to=stefani@seibold.net \
    --cc=Andreas.Brief@rohde-schwarz.com \
    --cc=Martin.Runge@rohde-schwarz.com \
    --cc=aarcange@redhat.com \
    --cc=ak@linux.intel.com \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=gorcunov@openvz.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=hpa@zytor.com \
    --cc=john.stultz@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=luto@amacapital.net \
    --cc=mingo@redhat.com \
    --cc=tglx@linutronix.de \
    --cc=x86@kernel.org \
    --cc=xemul@parallels.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).