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 <[email protected]>
Acked-by: John Stultz <[email protected]>
Cc: Magnus Damm <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Thomas Gleixner <[email protected]>

diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index 7279b94c01da3fdb31108e9ca3d3e8fb5202e923..aa6ba44e75d541e32ef9bf77899a21e04a6ae65b 100644 (file)
--- 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)
 }
 
 
-extern void timekeeping_notify(struct clocksource *clock);
+extern int timekeeping_notify(struct clocksource *clock);
 
 extern cycle_t clocksource_mmio_readl_up(struct clocksource *);
 extern cycle_t clocksource_mmio_readl_down(struct clocksource *);

diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
index dda5c7130d9359edf2ff0bfc9e17827a5ca3ca8e..1923a340bd91038d21579fee4acd5fe55f32389e 100644 (file)
--- 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);
        }
 }
 

diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 98cd470bbe4901569dad2a8ffb4a85f7945c5fca..da6e10c7a37823ad55c16f71ed883074a7cfcb7f 100644 (file)
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -648,14 +648,15 @@ static int change_clocksource(void *data)
  * This function is called from clocksource.c after a new, better clock
  * source has been registered. The caller holds the clocksource_mutex.
  */
-void timekeeping_notify(struct clocksource *clock)
+int timekeeping_notify(struct clocksource *clock)
 {
        struct timekeeper *tk = &timekeeper;
 
        if (tk->clock == clock)
-               return;
+               return 0;
        stop_machine(change_clocksource, clock, NULL);
        tick_clock_notify();
+       return tk->clock == clock ? 0 : -1;
 }
 
 /**