Skip to contentSkip to conversation

m68knommu: introduce asm/swab.h

PATCH In review Harvey Harrison 1 participant 1 message Jan 6, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 18/23 m68knommu: introduce asm/swab.h

Convert to the new-style arch overrides as well.

---
 arch/m68knommu/include/asm/Kbuild      |    2 ++
 arch/m68knommu/include/asm/byteorder.h |   22 +---------------------
 arch/m68knommu/include/asm/swab.h      |   24 ++++++++++++++++++++++++
 3 files changed, 27 insertions(+), 21 deletions(-)
arch/m68knommu/include/asm/Kbuild +2 -0
index c68e168..58c02a4 100644
@@ -1 +1,3 @@
 include include/asm-generic/Kbuild.asm
+
+unifdef-y += swab.h
arch/m68knommu/include/asm/byteorder.h +1 -21
index 20bb442..a6f0b8f 100644
@@ -1,27 +1,7 @@
 #ifndef _M68KNOMMU_BYTEORDER_H
 #define _M68KNOMMU_BYTEORDER_H
 
-#include <linux/types.h>
-
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__)
-#  define __BYTEORDER_HAS_U64__
-#  define __SWAB_64_THRU_32__
-#endif
-
-#if defined (__mcfisaaplus__) || defined (__mcfisac__)
-static inline __attribute_const__ __u32 ___arch__swab32(__u32 val)
-{
-	asm(
-			"byterev %0"
-			: "=d" (val)
-			: "0" (val)
-	   );
-	return val;
-}
-
-#define __arch__swab32(x) ___arch__swab32(x)
-#endif
-
+#include <asm/swab.h>
 #include <linux/byteorder/big_endian.h>
 
 #endif /* _M68KNOMMU_BYTEORDER_H */
arch/m68knommu/include/asm/swab.h new file +24 -0
new file mode 100644
index 0000000..e582257
@@ -0,0 +1,24 @@
+#ifndef _M68KNOMMU_SWAB_H
+#define _M68KNOMMU_SWAB_H
+
+#include <linux/types.h>
+
+#if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__)
+#  define __SWAB_64_THRU_32__
+#endif
+
+#if defined (__mcfisaaplus__) || defined (__mcfisac__)
+static inline __attribute_const__ __u32 __arch_swab32(__u32 val)
+{
+	asm(
+			"byterev %0"
+			: "=d" (val)
+			: "0" (val)
+	   );
+	return val;
+}
+
+#define __arch_swab32 __arch_swab32
+#endif
+
+#endif /* _M68KNOMMU_SWAB_H */
Signature · 1 line
1.6.1.94.g9388