Skip to contentSkip to conversation

m68knommu: use the new byteorder headers

PATCH In review Harvey Harrison 2 participants 2 messages Aug 19, 2008 – Aug 25, 2008

lore
Share & tools
lore

Harvey Harrison

author
#0 lore raw

PATCH 11/23 m68knommu: use the new byteorder headers

Signed-off-by Harvey Harrison <[email protected]>
---
 arch/m68knommu/include/asm/byteorder.h |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)
arch/m68knommu/include/asm/byteorder.h +5 -8
index 20bb442..6d9d3b8 100644
@@ -3,13 +3,11 @@
 
 #include <linux/types.h>
 
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__)
-#  define __BYTEORDER_HAS_U64__
-#  define __SWAB_64_THRU_32__
-#endif
+#define __BIG_ENDIAN
+#define __SWAB_64_THRU_32__
 
 #if defined (__mcfisaaplus__) || defined (__mcfisac__)
-static inline __attribute_const__ __u32 ___arch__swab32(__u32 val)
+static inline __attribute_const__ __u32 __arch_swab32(__u32 val)
 {
 	asm(
 			"byterev %0"

@@ -18,10 +16,9 @@ static inline __attribute_const__ __u32 ___arch__swab32(__u32 val)
 	   );
 	return val;
 }
-
-#define __arch__swab32(x) ___arch__swab32(x)
+#define __arch_swab32 __arch_swab32
 #endif
 
-#include <linux/byteorder/big_endian.h>
+#include <linux/byteorder.h>
 
 #endif /* _M68KNOMMU_BYTEORDER_H */
Signature · 1 line
1.6.0.274.g8aacc
Acked-by on v1 11/23
#1 lore raw

Hi Harvey,

Quoted 1 line · Harvey Harrison
Signed-off-by Harvey Harrison <[email protected]>

Looks ok to me.

Acked-by Greg Ungerer <[email protected]>

Regards
Greg

Quoted 37 lines
 arch/m68knommu/include/asm/byteorder.h |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)
arch/m68knommu/include/asm/byteorder.h +5 -8
index 20bb442..6d9d3b8 100644
@@ -3,13 +3,11 @@
 
 #include <linux/types.h>
 
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__)
-#  define __BYTEORDER_HAS_U64__
-#  define __SWAB_64_THRU_32__
-#endif
+#define __BIG_ENDIAN
+#define __SWAB_64_THRU_32__
 
 #if defined (__mcfisaaplus__) || defined (__mcfisac__)
-static inline __attribute_const__ __u32 ___arch__swab32(__u32 val)
+static inline __attribute_const__ __u32 __arch_swab32(__u32 val)
 {
 	asm(
 			"byterev %0"

@@ -18,10 +16,9 @@ static inline __attribute_const__ __u32 ___arch__swab32(__u32 val)
 	   );
 	return val;
 }
-
-#define __arch__swab32(x) ___arch__swab32(x)
+#define __arch_swab32 __arch_swab32
 #endif
 
-#include <linux/byteorder/big_endian.h>
+#include <linux/byteorder.h>
 
 #endif /* _M68KNOMMU_BYTEORDER_H */
Signature · 5 lines
------------------------------------------------------------------------
Greg Ungerer  --  Chief Software Dude       EMAIL:     [email protected]
SnapGear -- a Secure Computing Company      PHONE:       +61 7 3435 2888
825 Stanley St,                             FAX:         +61 7 3891 3630
Woolloongabba, QLD, 4102, Australia         WEB: http://www.SnapGear.com