summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorSeiichi Ikarashi <s.ikarashi@jp.fujitsu.com>2015-09-10 11:01:56 +0200
committerJohn Stultz <john.stultz@linaro.org>2015-12-07 21:15:28 +0100
commit390dd67c471a43a8a0f36c7d5177de49e7749c59 (patch)
tree8c2d75cb4dcc3ff5cbb52b0601b8b74a86d60e52 /kernel
parenttime: Avoid signed overflow in timekeeping_get_ns() (diff)
downloadlinux-390dd67c471a43a8a0f36c7d5177de49e7749c59.tar.xz
linux-390dd67c471a43a8a0f36c7d5177de49e7749c59.zip
clocksource: Add CPU info to clocksource watchdog reporting
The clocksource watchdog reporting was improved by 0b046b217ad4c6. I want to add the info of CPU where the watchdog detects a deviation because it is necessary to identify the trouble spot if the clocksource is TSC. Signed-off-by: Seiichi Ikarashi <s.ikarashi@jp.fujitsu.com> [jstultz: Tweaked commit message] Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/time/clocksource.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
index 1347882d131e..664de539299b 100644
--- a/kernel/time/clocksource.c
+++ b/kernel/time/clocksource.c
@@ -218,8 +218,8 @@ static void clocksource_watchdog(unsigned long data)
/* Check the deviation from the watchdog clocksource. */
if (abs(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("timekeeping watchdog on CPU%d: Marking clocksource '%s' as unstable because the skew is too large:\n",
+ smp_processor_id(), cs->name);
pr_warn(" '%s' wd_now: %llx wd_last: %llx mask: %llx\n",
watchdog->name, wdnow, wdlast, watchdog->mask);
pr_warn(" '%s' cs_now: %llx cs_last: %llx mask: %llx\n",