aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/time/ntp.c
diff options
context:
space:
mode:
authorRoman Zippel <zippel@linux-m68k.org>2008-05-01 07:34:38 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-01 11:03:59 -0400
commit7fc5c78409479d826341b103bdf734cb4fb02436 (patch)
treee68d8edddd633a9ed410b304684343afacf36175 /kernel/time/ntp.c
parent153b5d054ac2d98ea0d86504884326b6777f683d (diff)
ntp: rename TICK_LENGTH_SHIFT to NTP_SCALE_SHIFT
As TICK_LENGTH_SHIFT is used for more than just the tick length, the name isn't quite approriate anymore, so this renames it to NTP_SCALE_SHIFT. Signed-off-by: Roman Zippel <zippel@linux-m68k.org> Cc: john stultz <johnstul@us.ibm.com> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/time/ntp.c')
-rw-r--r--kernel/time/ntp.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index 10fe17df45a0..a8fd1ba1ef19 100644
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -27,7 +27,7 @@ static u64 tick_length, tick_length_base;
27 27
28#define MAX_TICKADJ 500 /* microsecs */ 28#define MAX_TICKADJ 500 /* microsecs */
29#define MAX_TICKADJ_SCALED (((u64)(MAX_TICKADJ * NSEC_PER_USEC) << \ 29#define MAX_TICKADJ_SCALED (((u64)(MAX_TICKADJ * NSEC_PER_USEC) << \
30 TICK_LENGTH_SHIFT) / NTP_INTERVAL_FREQ) 30 NTP_SCALE_SHIFT) / NTP_INTERVAL_FREQ)
31 31
32/* 32/*
33 * phase-lock loop variables 33 * phase-lock loop variables
@@ -48,13 +48,13 @@ static long ntp_tick_adj;
48static void ntp_update_frequency(void) 48static void ntp_update_frequency(void)
49{ 49{
50 u64 second_length = (u64)(tick_usec * NSEC_PER_USEC * USER_HZ) 50 u64 second_length = (u64)(tick_usec * NSEC_PER_USEC * USER_HZ)
51 << TICK_LENGTH_SHIFT; 51 << NTP_SCALE_SHIFT;
52 second_length += (s64)ntp_tick_adj << TICK_LENGTH_SHIFT; 52 second_length += (s64)ntp_tick_adj << NTP_SCALE_SHIFT;
53 second_length += time_freq; 53 second_length += time_freq;
54 54
55 tick_length_base = second_length; 55 tick_length_base = second_length;
56 56
57 tick_nsec = div_u64(second_length, HZ) >> TICK_LENGTH_SHIFT; 57 tick_nsec = div_u64(second_length, HZ) >> NTP_SCALE_SHIFT;
58 tick_length_base = div_u64(tick_length_base, NTP_INTERVAL_FREQ); 58 tick_length_base = div_u64(tick_length_base, NTP_INTERVAL_FREQ);
59} 59}
60 60
@@ -86,10 +86,10 @@ static void ntp_update_offset(long offset)
86 time_reftime = xtime.tv_sec; 86 time_reftime = xtime.tv_sec;
87 87
88 freq_adj = (s64)offset * mtemp; 88 freq_adj = (s64)offset * mtemp;
89 freq_adj <<= TICK_LENGTH_SHIFT - 2 * (SHIFT_PLL + 2 + time_constant); 89 freq_adj <<= NTP_SCALE_SHIFT - 2 * (SHIFT_PLL + 2 + time_constant);
90 time_status &= ~STA_MODE; 90 time_status &= ~STA_MODE;
91 if (mtemp >= MINSEC && (time_status & STA_FLL || mtemp > MAXSEC)) { 91 if (mtemp >= MINSEC && (time_status & STA_FLL || mtemp > MAXSEC)) {
92 freq_adj += div_s64((s64)offset << (TICK_LENGTH_SHIFT - SHIFT_FLL), 92 freq_adj += div_s64((s64)offset << (NTP_SCALE_SHIFT - SHIFT_FLL),
93 mtemp); 93 mtemp);
94 time_status |= STA_MODE; 94 time_status |= STA_MODE;
95 } 95 }
@@ -97,7 +97,7 @@ static void ntp_update_offset(long offset)
97 freq_adj = min(freq_adj, MAXFREQ_SCALED); 97 freq_adj = min(freq_adj, MAXFREQ_SCALED);
98 time_freq = max(freq_adj, -MAXFREQ_SCALED); 98 time_freq = max(freq_adj, -MAXFREQ_SCALED);
99 99
100 time_offset = div_s64((s64)offset << TICK_LENGTH_SHIFT, NTP_INTERVAL_FREQ); 100 time_offset = div_s64((s64)offset << NTP_SCALE_SHIFT, NTP_INTERVAL_FREQ);
101} 101}
102 102
103/** 103/**
@@ -197,7 +197,7 @@ void second_overflow(void)
197 tick_length -= MAX_TICKADJ_SCALED; 197 tick_length -= MAX_TICKADJ_SCALED;
198 } else { 198 } else {
199 tick_length += (s64)(time_adjust * NSEC_PER_USEC / 199 tick_length += (s64)(time_adjust * NSEC_PER_USEC /
200 NTP_INTERVAL_FREQ) << TICK_LENGTH_SHIFT; 200 NTP_INTERVAL_FREQ) << NTP_SCALE_SHIFT;
201 time_adjust = 0; 201 time_adjust = 0;
202 } 202 }
203 } 203 }
@@ -369,13 +369,13 @@ int do_adjtimex(struct timex *txc)
369 txc->offset = save_adjust; 369 txc->offset = save_adjust;
370 else { 370 else {
371 txc->offset = shift_right(time_offset * NTP_INTERVAL_FREQ, 371 txc->offset = shift_right(time_offset * NTP_INTERVAL_FREQ,
372 TICK_LENGTH_SHIFT); 372 NTP_SCALE_SHIFT);
373 if (!(time_status & STA_NANO)) 373 if (!(time_status & STA_NANO))
374 txc->offset /= NSEC_PER_USEC; 374 txc->offset /= NSEC_PER_USEC;
375 } 375 }
376 txc->freq = shift_right((s32)(time_freq >> PPM_SCALE_INV_SHIFT) * 376 txc->freq = shift_right((s32)(time_freq >> PPM_SCALE_INV_SHIFT) *
377 (s64)PPM_SCALE_INV, 377 (s64)PPM_SCALE_INV,
378 TICK_LENGTH_SHIFT); 378 NTP_SCALE_SHIFT);
379 txc->maxerror = time_maxerror; 379 txc->maxerror = time_maxerror;
380 txc->esterror = time_esterror; 380 txc->esterror = time_esterror;
381 txc->status = time_status; 381 txc->status = time_status;