The patch titled
ntp: remove time_tolerance
has been added to the -mm tree. Its filename is
ntp-remove-time_tolerance.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: ntp: remove time_tolerance
From: Roman Zippel <zippel@xxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxx>
Cc: john stultz <johnstul@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/linux/timex.h | 1 -
kernel/time/ntp.c | 9 ++++-----
2 files changed, 4 insertions(+), 6 deletions(-)
diff -puN include/linux/timex.h~ntp-remove-time_tolerance include/linux/timex.h
--- a/include/linux/timex.h~ntp-remove-time_tolerance
+++ a/include/linux/timex.h
@@ -207,7 +207,6 @@ extern int time_state; /* clock status
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 -puN kernel/time/ntp.c~ntp-remove-time_tolerance kernel/time/ntp.c
--- a/kernel/time/ntp.c~ntp-remove-time_tolerance
+++ a/kernel/time/ntp.c
@@ -40,7 +40,6 @@ int time_state = TIME_OK; /* clock sync
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) */
@@ -93,7 +92,7 @@ void second_overflow(void)
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;
@@ -319,8 +318,8 @@ int do_adjtimex(struct timex *txc)
} 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 */
@@ -343,7 +342,7 @@ leave: if ((time_status & (STA_UNSYNC|ST
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 */
_
Patches currently in -mm which might be from zippel@xxxxxxxxxxxxxx are
git-lxdialog.patch
make-prot_write-imply-prot_read.patch
ntp-move-all-the-ntp-related-code-to-ntpc.patch
ntp-add-ntp_update_frequency.patch
ntp-add-time_adj-to-tick-length.patch
ntp-add-time_freq-to-tick-length.patch
ntp-prescale-time_offset.patch
ntp-add-time_adjust-to-tick-length.patch
ntp-remove-time_tolerance.patch
ntp-convert-time_freq-to-nsec-value.patch
ntp-convert-to-the-ntp4-reference-model.patch
ntp-cleanup-defines-and-comments.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
