lkml.org 
[lkml]   [2010]   [Jul]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:timers/clocksource] powerpc: Cleanup xtime usage
    Commit-ID:  06d518e3dfb25334282c7e38b4d7a4eada215f6d
    Gitweb: http://git.kernel.org/tip/06d518e3dfb25334282c7e38b4d7a4eada215f6d
    Author: John Stultz <johnstul@us.ibm.com>
    AuthorDate: Tue, 13 Jul 2010 17:56:22 -0700
    Committer: Thomas Gleixner <tglx@linutronix.de>
    CommitDate: Tue, 27 Jul 2010 12:40:54 +0200

    powerpc: Cleanup xtime usage

    This removes powerpc's direct xtime usage, allowing for further
    generic timeekeping cleanups

    Signed-off-by: John Stultz <johnstul@us.ibm.com>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Anton Blanchard <anton@samba.org>
    LKML-Reference: <1279068988-21864-6-git-send-email-johnstul@us.ibm.com>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    ---
    arch/powerpc/kernel/time.c | 8 ++++----
    1 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
    index 6fcd648..0711d60 100644
    --- a/arch/powerpc/kernel/time.c
    +++ b/arch/powerpc/kernel/time.c
    @@ -864,9 +864,9 @@ void update_vsyscall(struct timespec *wall_time, struct clocksource *clock,
    /* XXX this assumes clock->shift == 22 */
    /* 4611686018 ~= 2^(20+64-22) / 1e9 */
    new_tb_to_xs = (u64) mult * 4611686018ULL;
    - new_stamp_xsec = (u64) xtime.tv_nsec * XSEC_PER_SEC;
    + new_stamp_xsec = (u64) wall_time->tv_nsec * XSEC_PER_SEC;
    do_div(new_stamp_xsec, 1000000000);
    - new_stamp_xsec += (u64) xtime.tv_sec * XSEC_PER_SEC;
    + new_stamp_xsec += (u64) wall_time->tv_sec * XSEC_PER_SEC;

    /*
    * tb_update_count is used to allow the userspace gettimeofday code
    @@ -884,7 +884,7 @@ void update_vsyscall(struct timespec *wall_time, struct clocksource *clock,
    vdso_data->tb_to_xs = new_tb_to_xs;
    vdso_data->wtom_clock_sec = wall_to_monotonic.tv_sec;
    vdso_data->wtom_clock_nsec = wall_to_monotonic.tv_nsec;
    - vdso_data->stamp_xtime = xtime;
    + vdso_data->stamp_xtime = *wall_time;
    smp_wmb();
    ++(vdso_data->tb_update_count);
    }
    @@ -1093,7 +1093,7 @@ void __init time_init(void)
    vdso_data->tb_orig_stamp = tb_last_jiffy;
    vdso_data->tb_update_count = 0;
    vdso_data->tb_ticks_per_sec = tb_ticks_per_sec;
    - vdso_data->stamp_xsec = (u64) xtime.tv_sec * XSEC_PER_SEC;
    + vdso_data->stamp_xsec = (u64) get_seconds() * XSEC_PER_SEC;
    vdso_data->tb_to_xs = tb_to_xs;

    write_sequnlock_irqrestore(&xtime_lock, flags);

    \
     
     \ /
      Last update: 2010-07-27 12:49    [W:0.023 / U:61.872 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site