Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755460AbYHMA3H (ORCPT ); Tue, 12 Aug 2008 20:29:07 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754718AbYHMA0r (ORCPT ); Tue, 12 Aug 2008 20:26:47 -0400 Received: from wf-out-1314.google.com ([209.85.200.169]:49095 "EHLO wf-out-1314.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754641AbYHMA0q (ORCPT ); Tue, 12 Aug 2008 20:26:46 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; b=nhkWHMH4n4QswxKlGyXV6yKDq1bN1bn/Msee5nuaNnzTlU05b7LKEapZQf1XZoERRn CMcdUbf6tmgD7Lpqf1HTxCfq8Tb24pL/MKvMKK0DMCxxS2rCev+CEb2s2YJ0VyI++Ffl 71SDQRO/i10mM3d644DuwLExxO++GC6yWAtzM= Subject: [PATCH 08/22] ia64: use the new byteorder headers From: Harvey Harrison To: "tony.luck" Cc: Andrew Morton , LKML Content-Type: text/plain Date: Tue, 12 Aug 2008 17:26:38 -0700 Message-Id: <1218587198.30194.81.camel@brick> Mime-Version: 1.0 X-Mailer: Evolution 2.22.3.1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1837 Lines: 65 Signed-off-by: Harvey Harrison --- The prerequisite patches have landed in Linus' tree now. arch/ia64/include/asm/byteorder.h | 26 +++++++++++--------------- 1 files changed, 11 insertions(+), 15 deletions(-) diff --git a/arch/ia64/include/asm/byteorder.h b/arch/ia64/include/asm/byteorder.h index 69bd41d..fac99a2 100644 --- a/arch/ia64/include/asm/byteorder.h +++ b/arch/ia64/include/asm/byteorder.h @@ -10,33 +10,29 @@ #include #include -static __inline__ __attribute_const__ __u64 -__ia64_swab64 (__u64 x) +#define __LITTLE_ENDIAN + +static inline __attribute_const__ __u64 __arch_swab64(__u64 x) { __u64 result; result = ia64_mux1(x, ia64_mux1_rev); return result; } +#define __arch_swab64 __arch_swab64 -static __inline__ __attribute_const__ __u32 -__ia64_swab32 (__u32 x) +static inline __attribute_const__ __u32 __arch_swab32(__u32 x) { - return __ia64_swab64(x) >> 32; + return __arch_swab64(x) >> 32; } +#define __arch_swab32 __arch_swab32 -static __inline__ __attribute_const__ __u16 -__ia64_swab16(__u16 x) +static inline __attribute_const__ __u16 __arch_swab16(__u16 x) { - return __ia64_swab64(x) >> 48; + return __arch_swab64(x) >> 48; } +#define __arch_swab16 __arch_swab16 -#define __arch__swab64(x) __ia64_swab64(x) -#define __arch__swab32(x) __ia64_swab32(x) -#define __arch__swab16(x) __ia64_swab16(x) - -#define __BYTEORDER_HAS_U64__ - -#include +#include #endif /* _ASM_IA64_BYTEORDER_H */ -- 1.6.0.rc2.233.g3cb9d -- 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/