aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2011-11-14 16:18:07 -0500
committerJohn Stultz <john.stultz@linaro.org>2012-01-26 22:44:23 -0500
commitea7cf49a7633c2b70125f59b4e3553d9181cb15d (patch)
tree877bca59752e387e93fc030079afc28515c86edf
parent8357929e6ae3661d5a3a7378a717f29873ea18c6 (diff)
ntp: Access tick_length variable via ntp_tick_length()
Currently the NTP managed tick_length value is accessed globally, in preparations for locking cleanups, make sure it is accessed via a function and mark it as static. CC: Thomas Gleixner <tglx@linutronix.de> CC: Eric Dumazet <eric.dumazet@gmail.com> CC: Richard Cochran <richardcochran@gmail.com> Signed-off-by: John Stultz <john.stultz@linaro.org>
-rw-r--r--include/linux/timex.h2
-rw-r--r--kernel/time/ntp.c9
-rw-r--r--kernel/time/timekeeping.c6
3 files changed, 12 insertions, 5 deletions
diff --git a/include/linux/timex.h b/include/linux/timex.h
index 92e01fc31ca6..b75e1864ed19 100644
--- a/include/linux/timex.h
+++ b/include/linux/timex.h
@@ -250,7 +250,7 @@ extern void ntp_clear(void);
250#define NTP_INTERVAL_LENGTH (NSEC_PER_SEC/NTP_INTERVAL_FREQ) 250#define NTP_INTERVAL_LENGTH (NSEC_PER_SEC/NTP_INTERVAL_FREQ)
251 251
252/* Returns how long ticks are at present, in ns / 2^NTP_SCALE_SHIFT. */ 252/* Returns how long ticks are at present, in ns / 2^NTP_SCALE_SHIFT. */
253extern u64 tick_length; 253extern u64 ntp_tick_length(void);
254 254
255extern void second_overflow(void); 255extern void second_overflow(void);
256extern int do_adjtimex(struct timex *); 256extern int do_adjtimex(struct timex *);
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index ae7e13607d91..f131ba62da62 100644
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -28,7 +28,7 @@ unsigned long tick_usec = TICK_USEC;
28/* ACTHZ period (nsecs): */ 28/* ACTHZ period (nsecs): */
29unsigned long tick_nsec; 29unsigned long tick_nsec;
30 30
31u64 tick_length; 31static u64 tick_length;
32static u64 tick_length_base; 32static u64 tick_length_base;
33 33
34static struct hrtimer leap_timer; 34static struct hrtimer leap_timer;
@@ -360,6 +360,13 @@ void ntp_clear(void)
360 pps_clear(); 360 pps_clear();
361} 361}
362 362
363
364u64 ntp_tick_length(void)
365{
366 return tick_length;
367}
368
369
363/* 370/*
364 * Leap second processing. If in leap-insert state at the end of the 371 * Leap second processing. If in leap-insert state at the end of the
365 * day, the system clock is set back one second; if in leap-delete 372 * day, the system clock is set back one second; if in leap-delete
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index f5d4d226defb..cdae24655c8d 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -811,7 +811,7 @@ static __always_inline int timekeeping_bigadjust(s64 error, s64 *interval,
811 * Now calculate the error in (1 << look_ahead) ticks, but first 811 * Now calculate the error in (1 << look_ahead) ticks, but first
812 * remove the single look ahead already included in the error. 812 * remove the single look ahead already included in the error.
813 */ 813 */
814 tick_error = tick_length >> (timekeeper.ntp_error_shift + 1); 814 tick_error = ntp_tick_length() >> (timekeeper.ntp_error_shift + 1);
815 tick_error -= timekeeper.xtime_interval >> 1; 815 tick_error -= timekeeper.xtime_interval >> 1;
816 error = ((error - tick_error) >> look_ahead) + tick_error; 816 error = ((error - tick_error) >> look_ahead) + tick_error;
817 817
@@ -994,7 +994,7 @@ static cycle_t logarithmic_accumulation(cycle_t offset, int shift)
994 timekeeper.raw_time.tv_nsec = raw_nsecs; 994 timekeeper.raw_time.tv_nsec = raw_nsecs;
995 995
996 /* Accumulate error between NTP and clock interval */ 996 /* Accumulate error between NTP and clock interval */
997 timekeeper.ntp_error += tick_length << shift; 997 timekeeper.ntp_error += ntp_tick_length() << shift;
998 timekeeper.ntp_error -= 998 timekeeper.ntp_error -=
999 (timekeeper.xtime_interval + timekeeper.xtime_remainder) << 999 (timekeeper.xtime_interval + timekeeper.xtime_remainder) <<
1000 (timekeeper.ntp_error_shift + shift); 1000 (timekeeper.ntp_error_shift + shift);
@@ -1042,7 +1042,7 @@ static void update_wall_time(void)
1042 shift = ilog2(offset) - ilog2(timekeeper.cycle_interval); 1042 shift = ilog2(offset) - ilog2(timekeeper.cycle_interval);
1043 shift = max(0, shift); 1043 shift = max(0, shift);
1044 /* Bound shift to one less then what overflows tick_length */ 1044 /* Bound shift to one less then what overflows tick_length */
1045 maxshift = (8*sizeof(tick_length) - (ilog2(tick_length)+1)) - 1; 1045 maxshift = (64 - (ilog2(ntp_tick_length())+1)) - 1;
1046 shift = min(shift, maxshift); 1046 shift = min(shift, maxshift);
1047 while (offset >= timekeeper.cycle_interval) { 1047 while (offset >= timekeeper.cycle_interval) {
1048 offset = logarithmic_accumulation(offset, shift); 1048 offset = logarithmic_accumulation(offset, shift);