Messages in this thread Patch in this message | | | Subject | Re: 2.6.22-rc2 built on ppc (2) | From | Thomas Gleixner <> | Date | Mon, 21 May 2007 12:03:37 +0200 |
| |
On Sun, 2007-05-20 at 14:37 -0700, Andrew Morton wrote: > On Sun, 20 May 2007 13:08:15 +0200 Elimar Riesebieter <riesebie@lxtec.de> wrote: > > > FYI, building 2.6.22-rc2 with > > gcc (GCC) 4.1.3 20070514 (prerelease) (Debian 4.1.2-7) > > on my powerbook (PPC) gives: > > > > ... > > kernel/time/ntp.c: In function 'do_adjtimex': > > kernel/time/ntp.c:307: warning: comparison of distinct pointer types lacks a cast > > kernel/time/ntp.c:310: warning: comparison of distinct pointer types lacks a cast > > hm, do_div() is defined as operating on a u64, but ntp is passing it an s64 > and the asm-generic implementation of do_div() is warning about that. > > Fixing that would be simple but a bit ugly.
We have the signed do_div() work around and it is used in the ntp code 5 lines further down already.
tglx
---------------------------------> Subject: NTP: use the signed divide function instead of do_div()
> > kernel/time/ntp.c:307: warning: comparison of distinct pointer types lacks a cast > > kernel/time/ntp.c:310: warning: comparison of distinct pointer types lacks a cast > > hm, do_div() is defined as operating on a u64, but ntp is passing it an s64 > and the asm-generic implementation of do_div() is warning about that.
Replace do_div() by div_long_long_rem_signed()
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index cb25649..bb1bf86 100644 --- a/kernel/time/ntp.c +++ b/kernel/time/ntp.c @@ -304,10 +304,12 @@ int do_adjtimex(struct timex *txc) temp64 = time_offset << (SHIFT_NSEC - SHIFT_FLL); if (time_offset < 0) { temp64 = -temp64; - do_div(temp64, mtemp); + temp64 = div_long_long_rem_signed(temp64, mtemp, + &rem); freq_adj -= temp64; } else { - do_div(temp64, mtemp); + temp64 = div_long_long_rem_signed(temp64, mtemp, + &rem); freq_adj += temp64; } }
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |