m68k: use the new byteorder headers

PATCH In review Harvey Harrison 1 participant 1 message Aug 13, 2008

lore

Share & tools

lore

Harvey Harrison

author

2008-08-13 00:29 UTC #0 lore raw

PATCH 10/22 m68k: use the new byteorder headers

Signed-off-by Harvey Harrison <[email protected]>

---
The prerequisite patches have landed in Linus' tree now.

 include/asm-m68k/byteorder.h |   16 +++++-----------
 1 files changed, 5 insertions(+), 11 deletions(-)

include/asm-m68k/byteorder.h +5 ~~-11~~

index 81d420b..b354acd 100644
@@ -4,22 +4,16 @@
 #include <asm/types.h>
 #include <linux/compiler.h>
 
-#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 <linux/byteorder/big_endian.h>
+#include <linux/byteorder.h>
 
 #endif /* _M68K_BYTEORDER_H */

Signature · 1 line

1.6.0.rc2.233.g3cb9d