Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757778AbYG3A6s (ORCPT ); Tue, 29 Jul 2008 20:58:48 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757477AbYG3Azm (ORCPT ); Tue, 29 Jul 2008 20:55:42 -0400 Received: from rv-out-0506.google.com ([209.85.198.228]:51866 "EHLO rv-out-0506.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757445AbYG3Azk (ORCPT ); Tue, 29 Jul 2008 20:55:40 -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=LhhtcLZZlanCcAEpJvE4uUoq6kgeTE+fEfHQZktkMsf8wYsFToTJ2V3vrkG8gPDiLm c3e/eZqWOO2qGcgKx2K7dc+c8182EIy4vhzcsl/YpUYoQHc5itUyfX6GTWomB1XqbB0c DUu2reTBKAjuftYcoFZ4XZnzsPpJ6Re0x0c9Y= Subject: [PATCH 11/24] m68k: use the new byteorder headers From: Harvey Harrison To: Andrew Morton Cc: LKML , Geert Uytterhoeven Content-Type: text/plain Date: Tue, 29 Jul 2008 17:55:22 -0700 Message-Id: <1217379323.23389.122.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: 1334 Lines: 46 Signed-off-by: Harvey Harrison --- include/asm-m68k/byteorder.h | 16 +++++----------- 1 files changed, 5 insertions(+), 11 deletions(-) diff --git a/include/asm-m68k/byteorder.h b/include/asm-m68k/byteorder.h index 81d420b..b354acd 100644 --- a/include/asm-m68k/byteorder.h +++ b/include/asm-m68k/byteorder.h @@ -4,22 +4,16 @@ #include #include -#ifdef __GNUC__ +#define __BIG_ENDIAN +#define __SWAB_64_THRU_32__ -static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 val) +static inline __attribute_const__ __u32 __arch_swab32(__u32 val) { __asm__("rolw #8,%0; swap %0; rolw #8,%0" : "=d" (val) : "0" (val)); return val; } -#define __arch__swab32(x) ___arch__swab32(x) +#define __arch_swab32 __arch_swab32 -#endif - -#if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__) -# define __BYTEORDER_HAS_U64__ -# define __SWAB_64_THRU_32__ -#endif - -#include +#include #endif /* _M68K_BYTEORDER_H */ -- 1.6.0.rc1.154.ge3fc -- 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/