lkml.org 
[lkml]   [2014]   [Mar]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/vdso] x86, vdso: Replace VVAR(vsyscall_gtod_data) by gtod macro
    Commit-ID:  2e0035eefd9cc8a386c706cab7547b5280772726
    Gitweb: http://git.kernel.org/tip/2e0035eefd9cc8a386c706cab7547b5280772726
    Author: Stefani Seibold <stefani@seibold.net>
    AuthorDate: Mon, 3 Mar 2014 22:12:16 +0100
    Committer: H. Peter Anvin <hpa@linux.intel.com>
    CommitDate: Wed, 5 Mar 2014 14:02:38 -0800

    x86, vdso: Replace VVAR(vsyscall_gtod_data) by gtod macro

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

    Reviewed-by: Andy Lutomirski <luto@amacapital.net>
    Signed-off-by: Stefani Seibold <stefani@seibold.net>
    Link: http://lkml.kernel.org/r/1393881143-3569-6-git-send-email-stefani@seibold.net
    Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
    ---
    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;

    \
     
     \ /
      Last update: 2014-03-06 00:21    [W:4.161 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site