Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753672AbZAGFIZ (ORCPT ); Wed, 7 Jan 2009 00:08:25 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751379AbZAGFIM (ORCPT ); Wed, 7 Jan 2009 00:08:12 -0500 Received: from smtp1.linux-foundation.org ([140.211.169.13]:47143 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751014AbZAGFIL (ORCPT ); Wed, 7 Jan 2009 00:08:11 -0500 Date: Tue, 6 Jan 2009 21:08:06 -0800 (PST) From: Linus Torvalds X-X-Sender: torvalds@localhost.localdomain To: Nicolas Pitre cc: Harvey Harrison , Benjamin Herrenschmidt , Linux Kernel Mailing List Subject: Re: powerpc: introduce asm/swab.h In-Reply-To: Message-ID: References: <200901070400.n0740Ore002063@hera.kernel.org> <1231303340.14860.61.camel@pasglop> <1231303722.14442.1.camel@brick> User-Agent: Alpine 2.00 (LFD 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1042 Lines: 33 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. 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/