MIME-version: 1.0
Content-transfer-encoding: 7BIT
Content-type: TEXT/PLAIN; charset=US-ASCII
Date: Wed, 07 Jan 2009 00:12:21 -0500 (EST)
From: Nicolas Pitre <nico@cam.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Harvey Harrison <harvey.harrison@gmail.com>,
       Benjamin Herrenschmidt <benh@kernel.crashing.org>,
       Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: powerpc: introduce asm/swab.h
In-reply-to: <alpine.LFD.2.00.0901062103390.3057@localhost.localdomain>
Message-id: <alpine.LFD.2.00.0901070011240.26118@xanadu.home>
References: <200901070400.n0740Ore002063@hera.kernel.org>
 <1231303340.14860.61.camel@pasglop> <1231303722.14442.1.camel@brick>
 <alpine.LFD.2.00.0901062354030.26118@xanadu.home>
 <alpine.LFD.2.00.0901062103390.3057@localhost.localdomain>
User-Agent: Alpine 2.00 (LFD 1167 2008-08-23)
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1152
Lines: 40

On Tue, 6 Jan 2009, Linus Torvalds wrote:

> 
> 
> On Tue, 6 Jan 2009, Nicolas Pitre wrote:
> > 
> > Well, this series breaks ARM as well:
> 
> Ahh. I think it's the __SWAB_64_THRU_32__ case that is broken. 
> 
> Does this fix things? Totally untested. Of course.

Yep.


> 
> 		Linus
> ---
>  include/linux/swab.h |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/include/linux/swab.h b/include/linux/swab.h
> index 9a2d33e..be5284d 100644
> --- a/include/linux/swab.h
> +++ b/include/linux/swab.h
> @@ -68,7 +68,7 @@ static inline __attribute_const__ __u64 __fswab64(__u64 val)
>  #elif defined(__SWAB_64_THRU_32__)
>  	__u32 h = val >> 32;
>  	__u32 l = val & ((1ULL << 32) - 1);
> -	return (((__u64)___swab32(l)) << 32) | ((__u64)(___swab32(h)));
> +	return (((__u64)__fswab32(l)) << 32) | ((__u64)(__fswab32(h)));
>  #else
>  	return ___constant_swab64(val);
>  #endif
> 
--
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/