linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / asm-mips / byteorder.h

diff --git a/include/asm-mips/byteorder.h b/include/asm-mips/byteorder.h
index eee83cb..4ce5bc3 100644 (file)
--- a/include/asm-mips/byteorder.h
+++ b/include/asm-mips/byteorder.h
@@ -8,6 +8,7 @@
 #ifndef _ASM_BYTEORDER_H
 #define _ASM_BYTEORDER_H
 
+#include <linux/config.h>
 #include <linux/compiler.h>
 #include <asm/types.h>
 
@@ -18,7 +19,9 @@
 static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 x)
 {
        __asm__(
+       "       .set    mips32r2                \n"
        "       wsbh    %0, %1                  \n"
+       "       .set    mips0                   \n"
        : "=r" (x)
        : "r" (x));
 
@@ -29,8 +32,10 @@ static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 x)
 static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)
 {
        __asm__(
+       "       .set    mips32r2                \n"
        "       wsbh    %0, %1                  \n"
        "       rotr    %0, %0, 16              \n"
+       "       .set    mips0                   \n"
        : "=r" (x)
        : "r" (x));
 
@@ -38,24 +43,6 @@ static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)
 }
 #define __arch__swab32(x)      ___arch__swab32(x)
 
-#ifdef CONFIG_CPU_MIPS64_R2
-
-static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 x)
-{
-       __asm__(
-       "       dsbh    %0, %1                  \n"
-       "       dshd    %0, %0                  \n"
-       "       drotr   %0, %0, 32              \n"
-       : "=r" (x)
-       : "r" (x));
-
-       return x;
-}
-
-#define __arch__swab64(x)      ___arch__swab64(x)
-
-#endif /* CONFIG_CPU_MIPS64_R2 */
-
 #endif /* CONFIG_CPU_MIPSR2 */
 
 #if !defined(__STRICT_ANSI__) || defined(__KERNEL__)