The patch titled
ntp-avoid-time_offset-overflows fix
has been removed from the -mm tree. Its filename was
ntp-avoid-time_offset-overflows-fix.patch
This patch was dropped because it was folded into ntp-avoid-time_offset-overflows.patch
------------------------------------------------------
Subject: ntp-avoid-time_offset-overflows fix
From: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
This is wrong, time_offset is signed and do_div is unsigned.
Cc: John Stultz <johnstul@xxxxxxxxxx>
Cc: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Cc: john stultz <johnstul@xxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/time/ntp.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff -puN kernel/time/ntp.c~ntp-avoid-time_offset-overflows-fix kernel/time/ntp.c
--- a/kernel/time/ntp.c~ntp-avoid-time_offset-overflows-fix
+++ a/kernel/time/ntp.c
@@ -196,7 +196,7 @@ void __attribute__ ((weak)) notify_arch_
*/
int do_adjtimex(struct timex *txc)
{
- long mtemp, save_adjust;
+ long mtemp, save_adjust, rem;
s64 freq_adj, temp64;
int result;
@@ -314,7 +314,9 @@ int do_adjtimex(struct timex *txc)
freq_adj += time_freq;
freq_adj = min(freq_adj, (s64)MAXFREQ_NSEC);
time_freq = max(freq_adj, (s64)-MAXFREQ_NSEC);
- do_div(time_offset, NTP_INTERVAL_FREQ);
+ time_offset = div_long_long_rem_signed(time_offset,
+ NTP_INTERVAL_FREQ,
+ &rem);
time_offset <<= SHIFT_UPDATE;
} /* STA_PLL */
} /* txc->modes & ADJ_OFFSET */
_
Patches currently in -mm which might be from tglx@xxxxxxxxxxxxx are
origin.patch
correct-slow-acpi_pm-rating.patch
ntp-avoid-time_offset-overflows.patch
ntp-avoid-time_offset-overflows-fix.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
