2007-05-20 11:38:15

by Elimar Riesebieter

[permalink] [raw]
Subject: 2.6.22-rc2 built on ppc (2)

Hi,

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
...

If more info is needed, please contact me via PM, as I am not
subscribed.

Thanks for your patience
Elimar

--
Never make anything simple and efficient when a way
can be found to make it complex and wonderful ;-)


Attachments:
(No filename) (557.00 B)
signature.asc (189.00 B)
Digital signature
Download all attachments

2007-05-20 21:40:41

by Andrew Morton

[permalink] [raw]
Subject: Re: 2.6.22-rc2 built on ppc (2)

On Sun, 20 May 2007 13:08:15 +0200 Elimar Riesebieter <[email protected]> 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.

The code around there needs to be taught about min_t and max_t, too..

2007-05-21 01:54:39

by Roman Zippel

[permalink] [raw]
Subject: Re: 2.6.22-rc2 built on ppc (2)

Hi,

On Sun, 20 May 2007, Andrew Morton wrote:

> On Sun, 20 May 2007 13:08:15 +0200 Elimar Riesebieter <[email protected]> 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.

The correct fix would be to clean up that API and provide a signed
do_div(), so ntp doesn't have to work around for the lack of it.
It's on my todo list for ages, but I haven't gotten to it yet.

bye, Roman

2007-05-21 09:57:15

by Thomas Gleixner

[permalink] [raw]
Subject: Re: 2.6.22-rc2 built on ppc (2)

On Sun, 2007-05-20 at 14:37 -0700, Andrew Morton wrote:
> On Sun, 20 May 2007 13:08:15 +0200 Elimar Riesebieter <[email protected]> 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 <[email protected]>

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;
}
}




2007-05-21 10:26:44

by Roman Zippel

[permalink] [raw]
Subject: Re: 2.6.22-rc2 built on ppc (2)

Hi,

On Mon, 21 May 2007, Thomas Gleixner wrote:

> 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;
> }
> }

This only returns a long.

bye, Roman

2007-05-21 10:33:38

by Thomas Gleixner

[permalink] [raw]
Subject: Re: 2.6.22-rc2 built on ppc (2)

On Mon, 2007-05-21 at 12:25 +0200, Roman Zippel wrote:

> This only returns a long.

Damn, you're right.

tglx