The patch titled
ntp: improve adjtimex frequency rounding
has been removed from the -mm tree. Its filename was
ntp-improve-adjtimex-frequency-rounding.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: ntp: improve adjtimex frequency rounding
From: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Change PPM_SCALE_INV_SHIFT so that it doesn't throw away any input bits
(19 is the amount of the factor 2 in PPM_SCALE), the output frequency
can then be calculated back to its input value, as the inverse divide
produce a slightly larger value, which is then correctly rounded by the
final shift.
Signed-off-by: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Cc: John Stultz <johnstul@xxxxxxxxxx>
Cc: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Reported-by: Martin Ziegler <ziegler@xxxxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/timex.h | 2 +-
kernel/time/ntp.c | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff -puN include/linux/timex.h~ntp-improve-adjtimex-frequency-rounding include/linux/timex.h
--- a/include/linux/timex.h~ntp-improve-adjtimex-frequency-rounding
+++ a/include/linux/timex.h
@@ -82,7 +82,7 @@
*/
#define SHIFT_USEC 16 /* frequency offset scale (shift) */
#define PPM_SCALE (NSEC_PER_USEC << (NTP_SCALE_SHIFT - SHIFT_USEC))
-#define PPM_SCALE_INV_SHIFT 20
+#define PPM_SCALE_INV_SHIFT 19
#define PPM_SCALE_INV ((1ll << (PPM_SCALE_INV_SHIFT + NTP_SCALE_SHIFT)) / \
PPM_SCALE + 1)
diff -puN kernel/time/ntp.c~ntp-improve-adjtimex-frequency-rounding kernel/time/ntp.c
--- a/kernel/time/ntp.c~ntp-improve-adjtimex-frequency-rounding
+++ a/kernel/time/ntp.c
@@ -406,9 +406,8 @@ adj_done:
if (time_status & (STA_UNSYNC|STA_CLOCKERR))
result = TIME_ERROR;
- txc->freq = shift_right((s32)(time_freq >> PPM_SCALE_INV_SHIFT) *
- (s64)PPM_SCALE_INV,
- NTP_SCALE_SHIFT);
+ txc->freq = shift_right((time_freq >> PPM_SCALE_INV_SHIFT) *
+ (s64)PPM_SCALE_INV, NTP_SCALE_SHIFT);
txc->maxerror = time_maxerror;
txc->esterror = time_esterror;
txc->status = time_status;
_
Patches currently in -mm which might be from zippel@xxxxxxxxxxxxxx are
git-tip.patch
hfsplus-quieten-down-mounting-hfsplus-journaled-fs-read-only.patch
hfsplus-fix-buffer-overflow-with-a-corrupted-image.patch
hfsplus-check-read_mapping_page-return-value.patch
hfsplus-fix-another-bug-when-reading-a-corrupted-image.patch
hfs-fix-namelength-memory-corruption.patch
hfsplus-check-hfs_bnode_find-return-value.patch
hfsplus-missing-o_largefile-check.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
