Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

[firefly-linux-kernel-4.4.55.git] / kernel / time / timekeeping.c

diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 900f1b6598d11ba52490f2aa52074a25a0daa206..687dff49f6e7da5ec92199f6bbae08de57e5ba43 100644 (file)
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -182,7 +182,7 @@ EXPORT_SYMBOL(do_settimeofday);
  */
 static void change_clocksource(void)
 {
-       struct clocksource *new;
+       struct clocksource *new, *old;
 
        new = clocksource_get_next();
 
@@ -191,11 +191,16 @@ static void change_clocksource(void)
 
        clocksource_forward_now();
 
-       new->raw_time = clock->raw_time;
+       if (clocksource_enable(new))
+               return;
 
+       new->raw_time = clock->raw_time;
+       old = clock;
        clock = new;
+       clocksource_disable(old);
+
        clock->cycle_last = 0;
-       clock->cycle_last = clocksource_read(new);
+       clock->cycle_last = clocksource_read(clock);
        clock->error = 0;
        clock->xtime_nsec = 0;
        clocksource_calculate_interval(clock, NTP_INTERVAL_LENGTH);
@@ -292,6 +297,7 @@ void __init timekeeping_init(void)
        ntp_init();
 
        clock = clocksource_get_next();
+       clocksource_enable(clock);
        clocksource_calculate_interval(clock, NTP_INTERVAL_LENGTH);
        clock->cycle_last = clocksource_read(clock);