Messages in this thread Patch in this message | | | From | David Howells <> | Subject | [PATCH] Make the kernel NTP code hand 64-bit *unsigned* values to do_div() | Date | Thu, 21 Feb 2008 15:54:02 +0000 |
| |
From: David Howells <dhowells@redhat.com>
The kernel NTP code shouldn't hand 64-bit *signed* values to do_div(). Make it instead hand 64-bit unsigned values. This gets rid of a couple of warnings.
Signed-off-by: David Howells <dhowells@redhat.com> ---
kernel/time/ntp.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index c88b591..3bead00 100644 --- a/kernel/time/ntp.c +++ b/kernel/time/ntp.c @@ -342,13 +342,15 @@ int do_adjtimex(struct timex *txc) freq_adj = shift_right(freq_adj, time_constant * 2 + (SHIFT_PLL + 2) * 2 - SHIFT_NSEC); if (mtemp >= MINSEC && (time_status & STA_FLL || mtemp > MAXSEC)) { + u64 utemp64; temp64 = time_offset << (SHIFT_NSEC - SHIFT_FLL); if (time_offset < 0) { - temp64 = -temp64; - do_div(temp64, mtemp); + utemp64 = -temp64; + do_div(utemp64, mtemp); freq_adj -= temp64; } else { - do_div(temp64, mtemp); + utemp64 = temp64; + do_div(utemp64, mtemp); freq_adj += temp64; } }
| |