Skip to contentSkip to conversation

mn10300: use the new byteorder headers

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

lore
Share & tools
lore

Harvey Harrison

author
#0 lore raw

PATCH 13/23 mn10300: use the new byteorder headers

Also remove the byteorder subfolder from the boot image install script.

Signed-off-by Harvey Harrison <[email protected]>
---
 arch/mn10300/boot/install.sh    |    5 -----
 include/asm-mn10300/byteorder.h |   23 +++++++----------------
 2 files changed, 7 insertions(+), 21 deletions(-)
arch/mn10300/boot/install.sh +0 -5
index abba309..9f8046c 100644
@@ -30,11 +30,6 @@ cd ${srctree}/include/linux
 for i in `find . -maxdepth 1 -name '*.h' -print`; do
   install -c -m 0644 $i $4/../usr/include/linux
 done
-install -c -m 0755 -d $4/../usr/include/linux/byteorder
-cd ${srctree}/include/linux/byteorder
-for i in `find . -name '*.h' -print`; do
-  install -c -m 0644 $i $4/../usr/include/linux/byteorder
-done
 install -c -m 0755 -d $4/../usr/include/linux/lockd
 cd ${srctree}/include/linux/lockd
 for i in `find . -name '*.h' -print`; do
include/asm-mn10300/byteorder.h +7 -16
index 3c993cc..762d8b2 100644
@@ -13,34 +13,25 @@
 
 #include <asm/types.h>
 
-#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 <linux/byteorder/little_endian.h>
+#include <linux/byteorder.h>
 
 #endif /* _ASM_BYTEORDER_H */
Signature · 1 line
1.6.0.274.g8aacc