[<prev] [next>] [day] [month] [year] [list]
Message-ID: <aa6e7a2b5c5737d9e54b77e3166a658d8e2f93fb.1438795461.git.shli@fb.com>
Date: Wed, 5 Aug 2015 11:12:54 -0700
From: Shaohua Li <shli@...com>
To: <linux-kernel@...r.kernel.org>
CC: <Kernel-team@...com>, John Stultz <john.stultz@...aro.org>,
Thomas Gleixner <tglx@...utronix.de>,
Ingo Molnar <mingo@...nel.org>
Subject: [PATCH 2/2] clocksource: sanity check watchdog clocksource
Add a sanity check to make sure watchdog clocksource doesn't wrap too
quickly.
Cc: John Stultz <john.stultz@...aro.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: Ingo Molnar <mingo@...nel.org>
Signed-off-by: Shaohua Li <shli@...com>
---
kernel/time/clocksource.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
index 8417c83..64e4629 100644
--- a/kernel/time/clocksource.c
+++ b/kernel/time/clocksource.c
@@ -327,7 +327,8 @@ static void clocksource_enqueue_watchdog(struct clocksource *cs)
if (cs->flags & CLOCK_SOURCE_IS_CONTINUOUS)
cs->flags |= CLOCK_SOURCE_VALID_FOR_HRES;
/* Pick the best watchdog. */
- if (!watchdog || cs->rating > watchdog->rating) {
+ if (cs->max_idle_ns > WATCHDOG_MAX_INTERVAL_NS &&
+ (!watchdog || cs->rating > watchdog->rating)) {
watchdog = cs;
/* Reset watchdog cycles */
clocksource_reset_watchdog();
--
1.8.5.6
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists