lkml.org 
[lkml]   [2011]   [Jan]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:timers/core] alpha: Change do_timer() to xtime_update()
    Commit-ID:  1340f3e0b29b745a33f431455c3a37f48197bc81
    Gitweb: http://git.kernel.org/tip/1340f3e0b29b745a33f431455c3a37f48197bc81
    Author: Torben Hohn <torbenh@gmx.de>
    AuthorDate: Thu, 27 Jan 2011 15:59:15 +0100
    Committer: Thomas Gleixner <tglx@linutronix.de>
    CommitDate: Mon, 31 Jan 2011 14:55:43 +0100

    alpha: Change do_timer() to xtime_update()

    xtime_update() takes the xtime_lock itself.

    timer_interrupt() is only called on the boot cpu. See do_entInt(). So
    "state" in timer_interrupt does not require protection by xtime_lock.

    Signed-off-by: Torben Hohn <torbenh@gmx.de>
    Cc: Richard Henderson <rth@twiddle.net>
    Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
    Cc: Matt Turner <mattst88@gmail.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: johnstul@us.ibm.com
    Cc: hch@infradead.org
    Cc: yong.zhang0@gmail.com
    LKML-Reference: <20110127145915.23248.20919.stgit@localhost>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    ---
    arch/alpha/kernel/time.c | 8 ++------
    1 files changed, 2 insertions(+), 6 deletions(-)

    diff --git a/arch/alpha/kernel/time.c b/arch/alpha/kernel/time.c
    index c1f3e7c..a58e84f 100644
    --- a/arch/alpha/kernel/time.c
    +++ b/arch/alpha/kernel/time.c
    @@ -159,7 +159,7 @@ void read_persistent_clock(struct timespec *ts)

    /*
    * timer_interrupt() needs to keep up the real-time clock,
    - * as well as call the "do_timer()" routine every clocktick
    + * as well as call the "xtime_update()" routine every clocktick
    */
    irqreturn_t timer_interrupt(int irq, void *dev)
    {
    @@ -172,8 +172,6 @@ irqreturn_t timer_interrupt(int irq, void *dev)
    profile_tick(CPU_PROFILING);
    #endif

    - write_seqlock(&xtime_lock);
    -
    /*
    * Calculate how many ticks have passed since the last update,
    * including any previous partial leftover. Save any resulting
    @@ -187,9 +185,7 @@ irqreturn_t timer_interrupt(int irq, void *dev)
    nticks = delta >> FIX_SHIFT;

    if (nticks)
    - do_timer(nticks);
    -
    - write_sequnlock(&xtime_lock);
    + xtime_update(nticks);

    if (test_irq_work_pending()) {
    clear_irq_work_pending();

    \
     
     \ /
      Last update: 2011-01-31 15:09    [W:0.026 / U:0.112 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site