Re: 2.6.17-rc5-mm2 link issues on s390

From: Heiko Carstens
Date: Thu Jun 08 2006 - 07:01:30 EST


On Thu, Jun 08, 2006 at 12:13:37PM +0200, Cedric Le Goater wrote:
> Heiko Carstens wrote:
>
> > This looks wrong: "b" is a u64 and you write it to something that is an
> > unsigned long. We're going to miss a few bits on 31 bit platforms...
>
> Indeed. Here's another version protecting the quad macros with __s390x__.
> to be applied on rc6-mm1.
>
> For the moment, __raw_writeq() is needed by __iowrite64_copy() which is
> protected by CONFIG_64BIT. Some drivers also use it.
>
> Thanks for reviewing,
>
> C.

> From: Cedric Le Goater <clg@xxxxxxxxxx>
> Replace-Subject: s390 adds __raw_writeq required by __iowrite64_copy.
>
> It also adds all the related quad routines.
>
> Signed-off-by: Cedric Le Goater <clg@xxxxxxxxxx>
>
> ---
> include/asm-s390/io.h | 15 +++++++++++++++
> 1 file changed, 15 insertions(+)
>
> Index: 2.6.17-rc6-mm1/include/asm-s390/io.h
> ===================================================================
> --- 2.6.17-rc6-mm1.orig/include/asm-s390/io.h
> +++ 2.6.17-rc6-mm1/include/asm-s390/io.h
> @@ -86,20 +86,35 @@ extern void iounmap(void *addr);
> #define readb(addr) (*(volatile unsigned char *) __io_virt(addr))
> #define readw(addr) (*(volatile unsigned short *) __io_virt(addr))
> #define readl(addr) (*(volatile unsigned int *) __io_virt(addr))
> +#ifdef __s390x__
> +#define readq(addr) (*(volatile unsigned long *) __io_virt(addr))
> +#endif

Please use an unsigned long long cast and get rid of the ifdefs...
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/