LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] Make the kernel NTP code hand 64-bit *unsigned* values to do_div() [try #3]
@ 2008-02-21 16:50 David Howells
  2008-02-23  8:04 ` Andrew Morton
  0 siblings, 1 reply; 5+ messages in thread
From: David Howells @ 2008-02-21 16:50 UTC (permalink / raw)
  To: torvalds, akpm, zippel, schwab; +Cc: linux-kernel, dhowells

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 |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)


diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index c88b591..d4bca92 100644
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -342,14 +342,16 @@ 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);
-			    freq_adj -= temp64;
+			    utemp64 = -temp64;
+			    do_div(utemp64, mtemp);
+			    freq_adj -= utemp64;
 			} else {
-			    do_div(temp64, mtemp);
-			    freq_adj += temp64;
+			    utemp64 = temp64;
+			    do_div(utemp64, mtemp);
+			    freq_adj += utemp64;
 			}
 		    }
 		    freq_adj += time_freq;


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2008-02-23 22:06 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-02-21 16:50 [PATCH] Make the kernel NTP code hand 64-bit *unsigned* values to do_div() [try #3] David Howells
2008-02-23  8:04 ` Andrew Morton
2008-02-23 21:01   ` Thomas Gleixner
2008-02-23 21:07     ` Andrew Morton
2008-02-23 22:05       ` Thomas Gleixner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).