Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c06b4f19 authored by Namhyung Kim's avatar Namhyung Kim Committed by Ingo Molnar
Browse files

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: default avatarNamhyung Kim <namhyung@kernel.org>
Acked-by: default avatarDon 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: default avatarIngo Molnar <mingo@kernel.org>
parent f86f7554

kernel/watchdog.c

+4 −6
Original line number Diff line number Diff line
@@ -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()))