Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

[~andy/linux] / kernel / time / timekeeping.c

diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 74bb5701e0b3de9c99ed526641e53186a2efe1a9..15be32e19c6e916dd2b52c29bac9d2b93f9cdef8 100644 (file)
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -25,6 +25,8 @@
 struct timekeeper {
        /* Current clocksource used for timekeeping. */
        struct clocksource *clock;
+       /* NTP adjusted clock multiplier */
+       u32     mult;
        /* The shift value of the current clocksource. */
        int     shift;
 
@@ -45,8 +47,6 @@ struct timekeeper {
        /* Shift conversion between clock shifted nano seconds and
         * ntp shifted nano seconds. */
        int     ntp_error_shift;
-       /* NTP adjusted clock multiplier */
-       u32     mult;
 
        /* The current time */
        struct timespec xtime;
@@ -172,17 +172,26 @@ static inline s64 timekeeping_get_ns_raw(void)
        return clocksource_cyc2ns(cycle_delta, clock->mult, clock->shift);
 }
 
+/* must hold write on timekeeper.lock */
+static void timekeeping_update(bool clearntp)
+{
+       if (clearntp) {
+               timekeeper.ntp_error = 0;
+               ntp_clear();
+       }
+       update_vsyscall(&timekeeper.xtime, &timekeeper.wall_to_monotonic,
+                        timekeeper.clock, timekeeper.mult);
+}
+
+
 void timekeeping_leap_insert(int leapsecond)
 {
        unsigned long flags;
 
        write_seqlock_irqsave(&timekeeper.lock, flags);
-
        timekeeper.xtime.tv_sec += leapsecond;
        timekeeper.wall_to_monotonic.tv_sec -= leapsecond;
-       update_vsyscall(&timekeeper.xtime, &timekeeper.wall_to_monotonic,
-                        timekeeper.clock, timekeeper.mult);
-
+       timekeeping_update(false);
        write_sequnlock_irqrestore(&timekeeper.lock, flags);
 
 }
@@ -386,12 +395,7 @@ int do_settimeofday(const struct timespec *tv)
                        timespec_sub(timekeeper.wall_to_monotonic, ts_delta);
 
        timekeeper.xtime = *tv;
-
-       timekeeper.ntp_error = 0;
-       ntp_clear();
-
-       update_vsyscall(&timekeeper.xtime, &timekeeper.wall_to_monotonic,
-                       timekeeper.clock, timekeeper.mult);
+       timekeeping_update(true);
 
        write_sequnlock_irqrestore(&timekeeper.lock, flags);
 
@@ -425,11 +429,7 @@ int timekeeping_inject_offset(struct timespec *ts)
        timekeeper.wall_to_monotonic =
                                timespec_sub(timekeeper.wall_to_monotonic, *ts);
 
-       timekeeper.ntp_error = 0;
-       ntp_clear();
-
-       update_vsyscall(&timekeeper.xtime, &timekeeper.wall_to_monotonic,
-                       timekeeper.clock, timekeeper.mult);
+       timekeeping_update(true);
 
        write_sequnlock_irqrestore(&timekeeper.lock, flags);
 
@@ -668,10 +668,7 @@ void timekeeping_inject_sleeptime(struct timespec *delta)
 
        __timekeeping_inject_sleeptime(delta);
 
-       timekeeper.ntp_error = 0;
-       ntp_clear();
-       update_vsyscall(&timekeeper.xtime, &timekeeper.wall_to_monotonic,
-                       timekeeper.clock, timekeeper.mult);
+       timekeeping_update(true);
 
        write_sequnlock_irqrestore(&timekeeper.lock, flags);
 
@@ -1083,9 +1080,7 @@ static void update_wall_time(void)
                second_overflow();
        }
 
-       /* check to see if there is a new clocksource to use */
-       update_vsyscall(&timekeeper.xtime, &timekeeper.wall_to_monotonic,
-                       timekeeper.clock, timekeeper.mult);
+       timekeeping_update(false);
 
 out:
        write_sequnlock_irqrestore(&timekeeper.lock, flags);
@@ -1265,6 +1260,8 @@ ktime_t ktime_get_monotonic_offset(void)
 
        return timespec_to_ktime(wtom);
 }
+EXPORT_SYMBOL_GPL(ktime_get_monotonic_offset);
+
 
 /**
  * xtime_update() - advances the timekeeping infrastructure