1 files changed, 28 insertions, 65 deletions

diff --git a/include/asm-ppc/byteorder.h b/include/asm-ppc/byteorder.h
index 240e7401a..0c771b2f4 100644
--- a/include/asm-ppc/byteorder.h
+++ b/include/asm-ppc/byteorder.h
@@ -9,85 +9,48 @@
 #define __BIG_ENDIAN_BITFIELD
 #endif
 
-#if 0 /* Assume PowerPC is Big-Endian! */
-#undef ntohl
-#undef ntohs
-#undef htonl
-#undef htons
-
-extern unsigned long int	ntohl(unsigned long int);
-extern unsigned short int	ntohs(unsigned short int);
-extern unsigned long int	htonl(unsigned long int);
-extern unsigned short int	htons(unsigned short int);
-
-extern unsigned long int	__ntohl(unsigned long int);
-extern unsigned short int	__ntohs(unsigned short int);
-extern unsigned long int	__constant_ntohl(unsigned long int);
-extern unsigned short int	__constant_ntohs(unsigned short int);
-
-extern __inline__ unsigned long int
-__ntohl(unsigned long int x)
-{
-	return (((x & 0x000000ffU) << 24) |
-		((x & 0x0000ff00U) <<  8) |
-		((x & 0x00ff0000U) >>  8) |
-		((x & 0xff000000U) >> 24));
-}
+#define ntohl(x) (x)
+#define ntohs(x) (x)
+#define htonl(x) (x)
+#define htons(x) (x)
+
+#define __htonl(x) ntohl(x)
+#define __htons(x) ntohs(x)
+#define __constant_htonl(x) ntohl(x)
+#define __constant_htons(x) ntohs(x)
+
+/*
+ * In-kernel byte order macros to handle stuff like
+ * byte-order-dependent filesystems etc.
+ */
 
-extern __inline__ unsigned long int
-__constant_ntohl(unsigned long int x)
+#define cpu_to_le32(x) le32_to_cpu((x))
+extern __inline__ unsigned long le32_to_cpu(unsigned long x)
 {
-	return (((x & 0x000000ffU) << 24) |
+     	return (((x & 0x000000ffU) << 24) |
 		((x & 0x0000ff00U) <<  8) |
 		((x & 0x00ff0000U) >>  8) |
 		((x & 0xff000000U) >> 24));
 }
 
-extern __inline__ unsigned short int
-__ntohs(unsigned short int x)
-{
-	return (((x & 0x00ff) << 8) |
-		((x & 0xff00) >> 8));
-}
 
-extern __inline__ unsigned short int
-__constant_ntohs(unsigned short int x)
+#define cpu_to_le16(x) le16_to_cpu((x))
+extern __inline__ unsigned short le16_to_cpu(unsigned short x)
 {
 	return (((x & 0x00ff) << 8) |
 		((x & 0xff00) >> 8));
 }
 
-#define __htonl(x) __ntohl(x)
-#define __htons(x) __ntohs(x)
-#define __constant_htonl(x) __constant_ntohl(x)
-#define __constant_htons(x) __constant_ntohs(x)
-
-#ifdef  __OPTIMIZE__
-#  define ntohl(x) \
-(__builtin_constant_p((long)(x)) ? \
- __constant_ntohl((x)) : \
- __ntohl((x)))
-#  define ntohs(x) \
-(__builtin_constant_p((short)(x)) ? \
- __constant_ntohs((x)) : \
- __ntohs((x)))
-#  define htonl(x) \
-(__builtin_constant_p((long)(x)) ? \
- __constant_htonl((x)) : \
- __htonl((x)))
-#  define htons(x) \
-(__builtin_constant_p((short)(x)) ? \
- __constant_htons((x)) : \
- __htons((x)))
-#endif
+#define cpu_to_be32(x) (x)
+#define be32_to_cpu(x) (x)
+#define cpu_to_be16(x) (x)
+#define be16_to_cpu(x) (x)
+
+
+#endif /* !(_PPC_BYTEORDER_H) */
+
+
 
-#else
 
-#define ntohl(x) (x)
-#define ntohs(x) (x)
-#define htonl(x) (x)
-#define htons(x) (x)
 
-#endif
 
-#endif /* !(_PPC_BYTEORDER_H) */