Commit 67dfae0c authored Sep 14, 2015 by John Stultz Committed by Thomas Gleixner Oct 02, 2015

clocksource: Fix abs() usage w/ 64bit values



This patch fixes one cases where abs() was being used with 64-bit
nanosecond values, where the result may be capped at 32-bits.

This potentially could cause watchdog false negatives on 32-bit
systems, so this patch addresses the issue by using abs64().

Signed-off-by: John Stultz <john.stultz@linaro.org>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: stable@vger.kernel.org
Link: http://lkml.kernel.org/r/1442279124-7309-2-git-send-email-john.stultz@linaro.org


Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent bdf7344e

kernel/time/clocksource.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -217,7 +217,7 @@ static void clocksource_watchdog(unsigned long data)
		continue;

		/* Check the deviation from the watchdog clocksource. */
		if ((abs(cs_nsec - wd_nsec) > WATCHDOG_THRESHOLD)) {
		if (abs64(cs_nsec - wd_nsec) > WATCHDOG_THRESHOLD) {
		pr_warn("timekeeping watchdog: Marking clocksource '%s' as unstable because the skew is too large:\n",
		cs->name);
		pr_warn(" '%s' wd_now: %llx wd_last: %llx mask: %llx\n",