Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755482AbYHMDzY (ORCPT ); Tue, 12 Aug 2008 23:55:24 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754064AbYHMDzJ (ORCPT ); Tue, 12 Aug 2008 23:55:09 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:35880 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753359AbYHMDzI (ORCPT ); Tue, 12 Aug 2008 23:55:08 -0400 Date: Tue, 12 Aug 2008 20:54:22 -0700 From: Andrew Morton To: Harvey Harrison Cc: Ingo Molnar , "H. Peter Anvin" , LKML , netdev@vger.kernel.org, per.liden@ericsson.com, jon.maloy@ericsson.com, allan.stephens@windriver.com Subject: Re: [PATCH 19/22] x86: use the new byteorder headers Message-Id: <20080812205422.4273d598.akpm@linux-foundation.org> In-Reply-To: <1218587234.30194.93.camel@brick> References: <1218587234.30194.93.camel@brick> X-Mailer: Sylpheed 2.4.8 (GTK+ 2.12.5; x86_64-redhat-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3619 Lines: 133 On Tue, 12 Aug 2008 17:27:14 -0700 Harvey Harrison wrote: > Signed-off-by: Harvey Harrison > --- > The prerequisite patches have landed in Linus' tree now. > > include/asm-x86/byteorder.h | 69 +++++++++++++++++-------------------------- > 1 files changed, 27 insertions(+), 42 deletions(-) > > diff --git a/include/asm-x86/byteorder.h b/include/asm-x86/byteorder.h > index e02ae2d..7187b3a 100644 > --- a/include/asm-x86/byteorder.h > +++ b/include/asm-x86/byteorder.h > @@ -4,26 +4,33 @@ > #include > #include > > -#ifdef __GNUC__ > +#define __LITTLE_ENDIAN > > -#ifdef __i386__ > - > -static inline __attribute_const__ __u32 ___arch__swab32(__u32 x) > +static inline __attribute_const__ __u32 __arch_swab32(__u32 val) > { > -#ifdef CONFIG_X86_BSWAP > - asm("bswap %0" : "=r" (x) : "0" (x)); > -#else > +#ifdef __i386__ > +# ifdef CONFIG_X86_BSWAP > + asm("bswap %0" : "=r" (val) : "0" (val)); > +# else > asm("xchgb %b0,%h0\n\t" /* swap lower bytes */ > "rorl $16,%0\n\t" /* swap words */ > "xchgb %b0,%h0" /* swap higher bytes */ > - : "=q" (x) > - : "0" (x)); > + : "=q" (val) > + : "0" (val)); > +# endif > + > +#else /* __i386__ */ > + asm("bswapl %0" > + : "=r" (val) > + : "0" (val)); > #endif > - return x; > + return val; > } > +#define __arch_swab32 __arch_swab32 > > -static inline __attribute_const__ __u64 ___arch__swab64(__u64 val) > +static inline __attribute_const__ __u64 __arch_swab64(__u64 val) > { > +#ifdef __i386__ > union { > struct { > __u32 a; > @@ -32,50 +39,28 @@ static inline __attribute_const__ __u64 ___arch__swab64(__u64 val) > __u64 u; > } v; > v.u = val; > -#ifdef CONFIG_X86_BSWAP > +# ifdef CONFIG_X86_BSWAP > asm("bswapl %0 ; bswapl %1 ; xchgl %0,%1" > : "=r" (v.s.a), "=r" (v.s.b) > : "0" (v.s.a), "1" (v.s.b)); > -#else > +# else > v.s.a = ___arch__swab32(v.s.a); > v.s.b = ___arch__swab32(v.s.b); > asm("xchgl %0,%1" > : "=r" (v.s.a), "=r" (v.s.b) > : "0" (v.s.a), "1" (v.s.b)); > -#endif > +# endif > return v.u; > -} > > #else /* __i386__ */ > - > -static inline __attribute_const__ __u64 ___arch__swab64(__u64 x) > -{ > asm("bswapq %0" > - : "=r" (x) > - : "0" (x)); > - return x; > -} > - > -static inline __attribute_const__ __u32 ___arch__swab32(__u32 x) > -{ > - asm("bswapl %0" > - : "=r" (x) > - : "0" (x)); > - return x; > -} > - > + : "=r" (val) > + : "0" (val)); > + return val; > #endif > +} > +#define __arch_swab64 __arch_swab64 > > -/* Do not define swab16. Gcc is smart enough to recognize "C" version and > - convert it into rotation or exhange. */ > - > -#define __arch__swab64(x) ___arch__swab64(x) > -#define __arch__swab32(x) ___arch__swab32(x) > - > -#define __BYTEORDER_HAS_U64__ > - > -#endif /* __GNUC__ */ > - > -#include > +#include > > #endif /* _ASM_X86_BYTEORDER_H */ net/tipc/subscr.c: In function 'htohl': net/tipc/subscr.c:88: error: implicit declaration of function '___constant_swab32' That's just a basic i386 allmodconfig. How come you're not seeing this? Heaven alone knows what tipc thinks it's doing poking into this sort of thing. Could you please take a look and teach it some manners? Thanks. -- 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/