[SPARC]: Merge asm-sparc{,64}/byteorder.h

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 49 deletions

diff --git a/include/asm-sparc64/byteorder.h b/include/asm-sparc64/byteorder.h
index 3943022906fd..f672855bee17 100644
--- a/include/asm-sparc64/byteorder.h
+++ b/include/asm-sparc64/byteorder.h
@@ -1,49 +1 @@
-#ifndef _SPARC64_BYTEORDER_H
-#define _SPARC64_BYTEORDER_H
-
-#include <asm/types.h>
-#include <asm/asi.h>
-
-#ifdef __GNUC__
-
-static inline __u16 ___arch__swab16p(const __u16 *addr)
-{
-        __u16 ret;
-
-        __asm__ __volatile__ ("lduha [%1] %2, %0"
-                              : "=r" (ret)
-                              : "r" (addr), "i" (ASI_PL));
-        return ret;
-}
-
-static inline __u32 ___arch__swab32p(const __u32 *addr)
-{
-        __u32 ret;
-
-        __asm__ __volatile__ ("lduwa [%1] %2, %0"
-                              : "=r" (ret)
-                              : "r" (addr), "i" (ASI_PL));
-        return ret;
-}
-
-static inline __u64 ___arch__swab64p(const __u64 *addr)
-{
-        __u64 ret;
-
-        __asm__ __volatile__ ("ldxa [%1] %2, %0"
-                              : "=r" (ret)
-                              : "r" (addr), "i" (ASI_PL));
-        return ret;
-}
-
-#define __arch__swab16p(x) ___arch__swab16p(x)
-#define __arch__swab32p(x) ___arch__swab32p(x)
-#define __arch__swab64p(x) ___arch__swab64p(x)
-
-#define __BYTEORDER_HAS_U64__
-
-#endif /* __GNUC__ */
-
-#include <linux/byteorder/big_endian.h>
-
-#endif /* _SPARC64_BYTEORDER_H */
+#include <asm-sparc/byteorder.h>