aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2013-04-25 16:31:44 -0400
committerThomas Gleixner <tglx@linutronix.de>2013-05-16 05:09:14 -0400
commitba919d1caa2e624eb8c6cae1f2ce0a253e697d45 (patch)
tree3f1ca3d84720e41093cd6723ff4a92122ecfec2e /include
parent5d33b883aed81c6fbcd09c6f7c3619eee850a7e2 (diff)
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 'include')
-rw-r--r--include/linux/clocksource.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index 7279b94c01da..aa6ba44e75d5 100644
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -321,7 +321,7 @@ static inline void __clocksource_updatefreq_khz(struct clocksource *cs, u32 khz)
321} 321}
322 322
323 323
324extern void timekeeping_notify(struct clocksource *clock); 324extern int timekeeping_notify(struct clocksource *clock);
325 325
326extern cycle_t clocksource_mmio_readl_up(struct clocksource *); 326extern cycle_t clocksource_mmio_readl_up(struct clocksource *);
327extern cycle_t clocksource_mmio_readl_down(struct clocksource *); 327extern cycle_t clocksource_mmio_readl_down(struct clocksource *);