Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755617AbYHMA3p (ORCPT ); Tue, 12 Aug 2008 20:29:45 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754758AbYHMA0u (ORCPT ); Tue, 12 Aug 2008 20:26:50 -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 S1754746AbYHMA0t (ORCPT ); Tue, 12 Aug 2008 20:26:49 -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=VocxPRiVAZc6v7ckkkjdrkl1ekpSkytM9Gu+lRyDHtDP2IN52Qcgr6zlDx2tQa3tvh sQ+20Sfs2OzYSTkceT1Ztw8mCk0hfcdho1LK9ZDzghDjtEoIduXeNnWzbzzv86/zGBB9 fK6pQiqGFEsFLojmh2CV6gZqyepzUZd3U4YBg= Subject: [PATCH 10/22] m68k: use the new byteorder headers From: Harvey Harrison To: Geert Uytterhoeven Cc: Andrew Morton , LKML Content-Type: text/plain Date: Tue, 12 Aug 2008 17:26:40 -0700 Message-Id: <1218587200.30194.83.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: 1393 Lines: 48 Signed-off-by: Harvey Harrison --- The prerequisite patches have landed in Linus' tree now. 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.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/