Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755895AbYHMAas (ORCPT ); Tue, 12 Aug 2008 20:30:48 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753608AbYHMA05 (ORCPT ); Tue, 12 Aug 2008 20:26:57 -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 S1754837AbYHMA0z (ORCPT ); Tue, 12 Aug 2008 20:26:55 -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=P9p/gbmGyi6hYLD44qsYiSEh3Zkf8f5sp19My+7ZONAQJD7to/J9xZq6Slxi4EghUl Al5gouXX1ney1m/YPpm4yAIFip/xwouYXkxfKeQI/kEH9NfrEX3Hsa75kp+VH47lx5HJ TcULZA+XsnQsV9CZ4tg+WM6ayrPKdf5DTkrzU= Subject: [PATCH 13/22] mn10300: use the new byteorder headers From: Harvey Harrison To: David Howells Cc: Andrew Morton , LKML Content-Type: text/plain Date: Tue, 12 Aug 2008 17:26:42 -0700 Message-Id: <1218587202.30194.86.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: 1670 Lines: 62 Signed-off-by: Harvey Harrison --- The prerequisite patches have landed in Linus' tree now. include/asm-mn10300/byteorder.h | 23 +++++++---------------- 1 files changed, 7 insertions(+), 16 deletions(-) diff --git a/include/asm-mn10300/byteorder.h b/include/asm-mn10300/byteorder.h index 3c993cc..762d8b2 100644 --- a/include/asm-mn10300/byteorder.h +++ b/include/asm-mn10300/byteorder.h @@ -13,34 +13,25 @@ #include -#ifdef __GNUC__ +#define __LITTLE_ENDIAN +#define __SWAB_64_THRU_32__ -static inline __attribute__((const)) -__u32 ___arch__swab32(__u32 x) +static inline __attribute_const__ __u32 __arch_swab32(__u32 x) { __u32 ret; asm("swap %1,%0" : "=r" (ret) : "r" (x)); return ret; } +#define __arch_swab32 __arch_swab32 -static inline __attribute__((const)) -__u16 ___arch__swab16(__u16 x) +static inline __attribute_const__ __u16 __arch_swab16(__u16 x) { __u16 ret; asm("swaph %1,%0" : "=r" (ret) : "r" (x)); return ret; } +#define __arch_swab16 __arch_swab16 -#define __arch__swab32(x) ___arch__swab32(x) -#define __arch__swab16(x) ___arch__swab16(x) - -#if !defined(__STRICT_ANSI__) || defined(__KERNEL__) -# define __BYTEORDER_HAS_U64__ -# define __SWAB_64_THRU_32__ -#endif - -#endif /* __GNUC__ */ - -#include +#include #endif /* _ASM_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/