lkml.org 
[lkml]   [2013]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:core/locking] watchdog: Use local_clock for get_timestamp()
    Commit-ID:  03d8c5dc53d2e883bd3badb6436a33fc64e2f638
    Gitweb: http://git.kernel.org/tip/03d8c5dc53d2e883bd3badb6436a33fc64e2f638
    Author: Namhyung Kim <namhyung.kim@lge.com>
    AuthorDate: Thu, 27 Dec 2012 11:49:44 +0900
    Committer: Ingo Molnar <mingo@kernel.org>
    CommitDate: Thu, 24 Jan 2013 15:13:36 +0100

    watchdog: Use local_clock for get_timestamp()

    The get_timestamp() function is always called with current cpu,
    thus using local_clock() would be more appropriate and it makes
    the code shorter and cleaner IMHO.

    Signed-off-by: Namhyung Kim <namhyung@kernel.org>
    Acked-by: Don Zickus <dzickus@redhat.com>
    Cc: Steven Rostedt <rostedt@goodmis.org>
    Link: http://lkml.kernel.org/r/1356576585-28782-1-git-send-email-namhyung@kernel.org
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    ---
    kernel/watchdog.c | 10 ++++------
    1 file changed, 4 insertions(+), 6 deletions(-)

    diff --git a/kernel/watchdog.c b/kernel/watchdog.c
    index 75a2ab3..082ca68 100644
    --- a/kernel/watchdog.c
    +++ b/kernel/watchdog.c
    @@ -112,9 +112,9 @@ static int get_softlockup_thresh(void)
    * resolution, and we don't need to waste time with a big divide when
    * 2^30ns == 1.074s.
    */
    -static unsigned long get_timestamp(int this_cpu)
    +static unsigned long get_timestamp(void)
    {
    - return cpu_clock(this_cpu) >> 30LL; /* 2^30 ~= 10^9 */
    + return local_clock() >> 30LL; /* 2^30 ~= 10^9 */
    }

    static void set_sample_period(void)
    @@ -132,9 +132,7 @@ static void set_sample_period(void)
    /* Commands for resetting the watchdog */
    static void __touch_watchdog(void)
    {
    - int this_cpu = smp_processor_id();
    -
    - __this_cpu_write(watchdog_touch_ts, get_timestamp(this_cpu));
    + __this_cpu_write(watchdog_touch_ts, get_timestamp());
    }

    void touch_softlockup_watchdog(void)
    @@ -195,7 +193,7 @@ static int is_hardlockup(void)

    static int is_softlockup(unsigned long touch_ts)
    {
    - unsigned long now = get_timestamp(smp_processor_id());
    + unsigned long now = get_timestamp();

    /* Warn about unreasonable delays: */
    if (time_after(now, touch_ts + get_softlockup_thresh()))

    \
     
     \ /
      Last update: 2013-01-24 22:43    [W:3.334 / U:0.124 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site