summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-11-13 23:19:49 +0000
committerJohn Stultz <john.stultz@linaro.org>2012-01-26 19:44:31 -0800
commitcc06268c6a87db156af2daed6e96a936b955cc82 (patch)
tree7edfb767cf3a58b82c8ee299d3689943b87d1d3d
parent058892e632aa53be8255c2f0a42f9ace7bed66bb (diff)
downloadop-kernel-dev-cc06268c6a87db156af2daed6e96a936b955cc82.zip
op-kernel-dev-cc06268c6a87db156af2daed6e96a936b955cc82.tar.gz
time: Move common updates to a function
CC: Thomas Gleixner <tglx@linutronix.de> CC: Eric Dumazet <eric.dumazet@gmail.com> CC: Richard Cochran <richardcochran@gmail.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: John Stultz <john.stultz@linaro.org>
-rw-r--r--kernel/time/timekeeping.c39
1 files changed, 17 insertions, 22 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 06f40ae..403c2a0 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -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);
OpenPOWER on IntegriCloud