[PATCH] ntp: remove time_tolerance
time_tolerance isn't changed at all in the kernel, so simply remove it, this
simplifies the next patch, as it avoids a number of conversions.
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Cc: john stultz <johnstul@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
diff --git a/include/linux/timex.h b/include/linux/timex.h
index b5f297e..7715b4c 100644
--- a/include/linux/timex.h
+++ b/include/linux/timex.h
@@ -208,7 +208,6 @@
extern int time_status; /* clock synchronization status bits */
extern long time_offset; /* time adjustment (us) */
extern long time_constant; /* pll time constant */
-extern long time_tolerance; /* frequency tolerance (ppm) */
extern long time_precision; /* clock precision (us) */
extern long time_maxerror; /* maximum error */
extern long time_esterror; /* estimated error */
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index 65223b7..af7563f 100644
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -34,7 +34,6 @@
int time_status = STA_UNSYNC; /* clock status bits */
long time_offset; /* time adjustment (ns) */
long time_constant = 2; /* pll time constant */
-long time_tolerance = MAXFREQ; /* frequency tolerance (ppm) */
long time_precision = 1; /* clock precision (us) */
long time_maxerror = NTP_PHASE_LIMIT; /* maximum error (us) */
long time_esterror = NTP_PHASE_LIMIT; /* estimated error (us) */
@@ -87,7 +86,7 @@
long time_adj;
/* Bump the maxerror field */
- time_maxerror += time_tolerance >> SHIFT_USEC;
+ time_maxerror += MAXFREQ >> SHIFT_USEC;
if (time_maxerror > NTP_PHASE_LIMIT) {
time_maxerror = NTP_PHASE_LIMIT;
time_status |= STA_UNSYNC;
@@ -313,8 +312,8 @@
} else /* calibration interval too long (p. 12) */
result = TIME_ERROR;
}
- time_freq = min(time_freq, time_tolerance);
- time_freq = max(time_freq, -time_tolerance);
+ time_freq = min(time_freq, MAXFREQ);
+ time_freq = max(time_freq, -MAXFREQ);
time_offset = (time_offset * NSEC_PER_USEC / HZ) << SHIFT_UPDATE;
} /* STA_PLL */
} /* txc->modes & ADJ_OFFSET */
@@ -337,7 +336,7 @@
txc->status = time_status;
txc->constant = time_constant;
txc->precision = time_precision;
- txc->tolerance = time_tolerance;
+ txc->tolerance = MAXFREQ;
txc->tick = tick_usec;
/* PPS is not implemented, so these are zero */