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] cris: arch-v32: Switch do_timer() to xtime_update()
    Commit-ID:  36cb07bb8118cb14211ef25c58026f005877c47d
    Gitweb: http://git.kernel.org/tip/36cb07bb8118cb14211ef25c58026f005877c47d
    Author: Torben Hohn <torbenh@gmx.de>
    AuthorDate: Thu, 27 Jan 2011 15:59:41 +0100
    Committer: Thomas Gleixner <tglx@linutronix.de>
    CommitDate: Mon, 31 Jan 2011 14:55:44 +0100

    cris: arch-v32: Switch do_timer() to xtime_update()

    xtime_update() takes the xtime_lock itself.

    Signed-off-by: Torben Hohn <torbenh@gmx.de>
    Cc: hch@infradead.org
    Cc: Jesper Nilsson <jesper.nilsson@axis.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: johnstul@us.ibm.com
    Cc: Mikael Starvik <starvik@axis.com>
    Cc: yong.zhang0@gmail.com
    LKML-Reference: <20110127145941.23248.92547.stgit@localhost>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    ---
    arch/cris/arch-v32/kernel/time.c | 6 ++----
    1 files changed, 2 insertions(+), 4 deletions(-)

    diff --git a/arch/cris/arch-v32/kernel/time.c b/arch/cris/arch-v32/kernel/time.c
    index a545211..bb978ed 100644
    --- a/arch/cris/arch-v32/kernel/time.c
    +++ b/arch/cris/arch-v32/kernel/time.c
    @@ -183,7 +183,7 @@ void handle_watchdog_bite(struct pt_regs *regs)

    /*
    * 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.
    */
    extern void cris_do_profile(struct pt_regs *regs);

    @@ -216,9 +216,7 @@ static inline irqreturn_t timer_interrupt(int irq, void *dev_id)
    return IRQ_HANDLED;

    /* Call the real timer interrupt handler */
    - write_seqlock(&xtime_lock);
    - do_timer(1);
    - write_sequnlock(&xtime_lock);
    + xtime_update(1);
    return IRQ_HANDLED;
    }


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