summaryrefslogtreecommitdiffstats
path: root/kernel/time/clocksource.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2013-04-25 20:31:44 +0000
committerThomas Gleixner <tglx@linutronix.de>2013-05-16 11:09:14 +0200
commitba919d1caa2e624eb8c6cae1f2ce0a253e697d45 (patch)
tree3f1ca3d84720e41093cd6723ff4a92122ecfec2e /kernel/time/clocksource.c
parent5d33b883aed81c6fbcd09c6f7c3619eee850a7e2 (diff)
downloadlinux-ba919d1caa2e624eb8c6cae1f2ce0a253e697d45.tar.gz
linux-ba919d1caa2e624eb8c6cae1f2ce0a253e697d45.tar.bz2
linux-ba919d1caa2e624eb8c6cae1f2ce0a253e697d45.zip
clocksource: Let timekeeping_notify return success/error
timekeeping_notify() can fail due cs->enable() failure. Though the caller does not notice and happily keeps the wrong clocksource as the current one. Let the caller know about failure, so the current clocksource will be shown correctly in sysfs. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: John Stultz <john.stultz@linaro.org> Cc: Magnus Damm <magnus.damm@gmail.com> Link: http://lkml.kernel.org/r/20130425143435.696321912@linutronix.de Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/time/clocksource.c')
-rw-r--r--kernel/time/clocksource.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
index dda5c7130d93..1923a340bd91 100644
--- a/kernel/time/clocksource.c
+++ b/kernel/time/clocksource.c
@@ -611,10 +611,10 @@ static void clocksource_select(void)
best = cs;
break;
}
- if (curr_clocksource != best) {
- printk(KERN_INFO "Switching to clocksource %s\n", best->name);
+
+ if (curr_clocksource != best && !timekeeping_notify(best)) {
+ pr_info("Switched to clocksource %s\n", best->name);
curr_clocksource = best;
- timekeeping_notify(curr_clocksource);
}
}