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] xtensa: Switch do_timer() to xtime_update()
    Commit-ID:  d12b0e24c56c6fb2398609f26858e5278d688840
    Gitweb: http://git.kernel.org/tip/d12b0e24c56c6fb2398609f26858e5278d688840
    Author: Torben Hohn <torbenh@gmx.de>
    AuthorDate: Thu, 27 Jan 2011 16:00:27 +0100
    Committer: Thomas Gleixner <tglx@linutronix.de>
    CommitDate: Mon, 31 Jan 2011 14:55:46 +0100

    xtensa: Switch do_timer() to xtime_update()

    xtime_update() takes the xtime_lock itself.

    set_linux_timer() does not need to be protected by xtime_lock.

    [ tglx: This code is broken on SMP anyway. ]

    Signed-off-by: Torben Hohn <torbenh@gmx.de>
    Cc: Chris Zankel <chris@zankel.net>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: johnstul@us.ibm.com
    Cc: hch@infradead.org
    Cc: yong.zhang0@gmail.com
    LKML-Reference: <20110127150027.23248.61798.stgit@localhost>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    ---
    arch/xtensa/kernel/time.c | 6 +-----
    1 files changed, 1 insertions(+), 5 deletions(-)

    diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c
    index 19df764..f3e5eb4 100644
    --- a/arch/xtensa/kernel/time.c
    +++ b/arch/xtensa/kernel/time.c
    @@ -96,16 +96,12 @@ again:
    update_process_times(user_mode(get_irq_regs()));
    #endif

    - write_seqlock(&xtime_lock);
    -
    - do_timer(1); /* Linux handler in kernel/timer.c */
    + xtime_update(1); /* Linux handler in kernel/time/timekeeping */

    /* Note that writing CCOMPARE clears the interrupt. */

    next += CCOUNT_PER_JIFFY;
    set_linux_timer(next);
    -
    - write_sequnlock(&xtime_lock);
    }

    /* Allow platform to do something useful (Wdog). */

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