linux-kernel - Re: [Patch] musb: fix a build error on mips

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Fri, 3 Feb 2012 09:16:25 +0200
From:	Felipe Balbi <balbi@...com>
To:	Cong Wang <xiyou.wangcong@...il.com>
Cc:	linux-kernel@...r.kernel.org,
	Andrew Morton <akpm@...ux-foundation.org>,
	Felipe Balbi <balbi@...com>,
	Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
	linux-usb@...r.kernel.org
Subject: Re: [Patch] musb: fix a build error on mips

Hi,

On Fri, Feb 03, 2012 at 03:14:17PM +0800, Cong Wang wrote:
> On mips, we got:
> 
> drivers/usb/musb/musb_io.h:44: error: conflicting types for 'readsl'
> arch/mips/include/asm/io.h:529: error: previous definition of 'readsl' was here
> drivers/usb/musb/musb_io.h:46: error: conflicting types for 'readsw'
> arch/mips/include/asm/io.h:528: error: previous definition of 'readsw' was here
> drivers/usb/musb/musb_io.h:48: error: conflicting types for 'readsb'
> 
> so, should add !defined(CONFIG_MIPS) too.
> 
> Cc: Felipe Balbi <balbi@...com>
> Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
> Signed-off-by: WANG Cong <xiyou.wangcong@...il.com>
> 
> ---
> diff --git a/drivers/usb/musb/musb_io.h b/drivers/usb/musb/musb_io.h
> index e61aa95..1d5eda2 100644
> --- a/drivers/usb/musb/musb_io.h
> +++ b/drivers/usb/musb/musb_io.h
> @@ -39,7 +39,8 @@
>  
>  #if !defined(CONFIG_ARM) && !defined(CONFIG_SUPERH) \
>  	&& !defined(CONFIG_AVR32) && !defined(CONFIG_PPC32) \
> -	&& !defined(CONFIG_PPC64) && !defined(CONFIG_BLACKFIN)
> +	&& !defined(CONFIG_PPC64) && !defined(CONFIG_BLACKFIN) \
> +	&& !defined(CONFIG_MIPS)
>  static inline void readsl(const void __iomem *addr, void *buf, int len)
>  	{ insl((unsigned long)addr, buf, len); }
>  static inline void readsw(const void __iomem *addr, void *buf, int len)

Thanks a lot, will apply.

-- 
balbi

Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)