]> git.karo-electronics.de Git - karo-tx-linux.git/blobdiff - arch/mips/kernel/unaligned.c
Merge branch '4.0-fixes' into mips-for-linux-next
[karo-tx-linux.git] / arch / mips / kernel / unaligned.c
index 27af5634a69ba0cc02971d01d933fb14eec47e4d..af84bef0c90de4bc65e14669dca132ebb7147846 100644 (file)
@@ -107,10 +107,11 @@ static u32 unaligned_action;
 extern void show_registers(struct pt_regs *regs);
 
 #ifdef __BIG_ENDIAN
-#define     LoadHW(addr, value, res)  \
+#define     _LoadHW(addr, value, res, type)  \
+do {                                                        \
                __asm__ __volatile__ (".set\tnoat\n"        \
-                       "1:\t"user_lb("%0", "0(%2)")"\n"    \
-                       "2:\t"user_lbu("$1", "1(%2)")"\n\t" \
+                       "1:\t"type##_lb("%0", "0(%2)")"\n"  \
+                       "2:\t"type##_lbu("$1", "1(%2)")"\n\t"\
                        "sll\t%0, 0x8\n\t"                  \
                        "or\t%0, $1\n\t"                    \
                        "li\t%1, 0\n"                       \
@@ -125,13 +126,15 @@ extern void show_registers(struct pt_regs *regs);
                        STR(PTR)"\t2b, 4b\n\t"              \
                        ".previous"                         \
                        : "=&r" (value), "=r" (res)         \
-                       : "r" (addr), "i" (-EFAULT));
+                       : "r" (addr), "i" (-EFAULT));       \
+} while(0)
 
 #ifndef CONFIG_CPU_MIPSR6
-#define     LoadW(addr, value, res)   \
+#define     _LoadW(addr, value, res, type)   \
+do {                                                        \
                __asm__ __volatile__ (                      \
-                       "1:\t"user_lwl("%0", "(%2)")"\n"    \
-                       "2:\t"user_lwr("%0", "3(%2)")"\n\t" \
+                       "1:\t"type##_lwl("%0", "(%2)")"\n"   \
+                       "2:\t"type##_lwr("%0", "3(%2)")"\n\t"\
                        "li\t%1, 0\n"                       \
                        "3:\n\t"                            \
                        ".insn\n\t"                         \
@@ -144,21 +147,24 @@ extern void show_registers(struct pt_regs *regs);
                        STR(PTR)"\t2b, 4b\n\t"              \
                        ".previous"                         \
                        : "=&r" (value), "=r" (res)         \
-                       : "r" (addr), "i" (-EFAULT));
+                       : "r" (addr), "i" (-EFAULT));       \
+} while(0)
+
 #else
 /* MIPSR6 has no lwl instruction */
-#define     LoadW(addr, value, res) \
+#define     _LoadW(addr, value, res, type) \
+do {                                                        \
                __asm__ __volatile__ (                      \
                        ".set\tpush\n"                      \
                        ".set\tnoat\n\t"                    \
-                       "1:"user_lb("%0", "0(%2)")"\n\t"    \
-                       "2:"user_lbu("$1", "1(%2)")"\n\t"   \
+                       "1:"type##_lb("%0", "0(%2)")"\n\t"  \
+                       "2:"type##_lbu("$1", "1(%2)")"\n\t" \
                        "sll\t%0, 0x8\n\t"                  \
                        "or\t%0, $1\n\t"                    \
-                       "3:"user_lbu("$1", "2(%2)")"\n\t"   \
+                       "3:"type##_lbu("$1", "2(%2)")"\n\t" \
                        "sll\t%0, 0x8\n\t"                  \
                        "or\t%0, $1\n\t"                    \
-                       "4:"user_lbu("$1", "3(%2)")"\n\t"   \
+                       "4:"type##_lbu("$1", "3(%2)")"\n\t" \
                        "sll\t%0, 0x8\n\t"                  \
                        "or\t%0, $1\n\t"                    \
                        "li\t%1, 0\n"                       \
@@ -176,14 +182,17 @@ extern void show_registers(struct pt_regs *regs);
                        STR(PTR)"\t4b, 11b\n\t"             \
                        ".previous"                         \
                        : "=&r" (value), "=r" (res)         \
-                       : "r" (addr), "i" (-EFAULT));
+                       : "r" (addr), "i" (-EFAULT));       \
+} while(0)
+
 #endif /* CONFIG_CPU_MIPSR6 */
 
-#define     LoadHWU(addr, value, res) \
+#define     _LoadHWU(addr, value, res, type) \
+do {                                                        \
                __asm__ __volatile__ (                      \
                        ".set\tnoat\n"                      \
-                       "1:\t"user_lbu("%0", "0(%2)")"\n"   \
-                       "2:\t"user_lbu("$1", "1(%2)")"\n\t" \
+                       "1:\t"type##_lbu("%0", "0(%2)")"\n" \
+                       "2:\t"type##_lbu("$1", "1(%2)")"\n\t"\
                        "sll\t%0, 0x8\n\t"                  \
                        "or\t%0, $1\n\t"                    \
                        "li\t%1, 0\n"                       \
@@ -199,13 +208,15 @@ extern void show_registers(struct pt_regs *regs);
                        STR(PTR)"\t2b, 4b\n\t"              \
                        ".previous"                         \
                        : "=&r" (value), "=r" (res)         \
-                       : "r" (addr), "i" (-EFAULT));
+                       : "r" (addr), "i" (-EFAULT));       \
+} while(0)
 
 #ifndef CONFIG_CPU_MIPSR6
-#define     LoadWU(addr, value, res)  \
+#define     _LoadWU(addr, value, res, type)  \
+do {                                                        \
                __asm__ __volatile__ (                      \
-                       "1:\t"user_lwl("%0", "(%2)")"\n"    \
-                       "2:\t"user_lwr("%0", "3(%2)")"\n\t" \
+                       "1:\t"type##_lwl("%0", "(%2)")"\n"  \
+                       "2:\t"type##_lwr("%0", "3(%2)")"\n\t"\
                        "dsll\t%0, %0, 32\n\t"              \
                        "dsrl\t%0, %0, 32\n\t"              \
                        "li\t%1, 0\n"                       \
@@ -220,9 +231,11 @@ extern void show_registers(struct pt_regs *regs);
                        STR(PTR)"\t2b, 4b\n\t"              \
                        ".previous"                         \
                        : "=&r" (value), "=r" (res)         \
-                       : "r" (addr), "i" (-EFAULT));
+                       : "r" (addr), "i" (-EFAULT));       \
+} while(0)
 
-#define     LoadDW(addr, value, res)  \
+#define     _LoadDW(addr, value, res)  \
+do {                                                        \
                __asm__ __volatile__ (                      \
                        "1:\tldl\t%0, (%2)\n"               \
                        "2:\tldr\t%0, 7(%2)\n\t"            \
@@ -238,21 +251,24 @@ extern void show_registers(struct pt_regs *regs);
                        STR(PTR)"\t2b, 4b\n\t"              \
                        ".previous"                         \
                        : "=&r" (value), "=r" (res)         \
-                       : "r" (addr), "i" (-EFAULT));
+                       : "r" (addr), "i" (-EFAULT));       \
+} while(0)
+
 #else
 /* MIPSR6 has not lwl and ldl instructions */
-#define            LoadWU(addr, value, res) \
+#define            _LoadWU(addr, value, res, type) \
+do {                                                        \
                __asm__ __volatile__ (                      \
                        ".set\tpush\n\t"                    \
                        ".set\tnoat\n\t"                    \
-                       "1:"user_lbu("%0", "0(%2)")"\n\t"   \
-                       "2:"user_lbu("$1", "1(%2)")"\n\t"   \
+                       "1:"type##_lbu("%0", "0(%2)")"\n\t" \
+                       "2:"type##_lbu("$1", "1(%2)")"\n\t" \
                        "sll\t%0, 0x8\n\t"                  \
                        "or\t%0, $1\n\t"                    \
-                       "3:"user_lbu("$1", "2(%2)")"\n\t"   \
+                       "3:"type##_lbu("$1", "2(%2)")"\n\t" \
                        "sll\t%0, 0x8\n\t"                  \
                        "or\t%0, $1\n\t"                    \
-                       "4:"user_lbu("$1", "3(%2)")"\n\t"   \
+                       "4:"type##_lbu("$1", "3(%2)")"\n\t" \
                        "sll\t%0, 0x8\n\t"                  \
                        "or\t%0, $1\n\t"                    \
                        "li\t%1, 0\n"                       \
@@ -270,9 +286,11 @@ extern void show_registers(struct pt_regs *regs);
                        STR(PTR)"\t4b, 11b\n\t"             \
                        ".previous"                         \
                        : "=&r" (value), "=r" (res)         \
-                       : "r" (addr), "i" (-EFAULT));
+                       : "r" (addr), "i" (-EFAULT));       \
+} while(0)
 
-#define     LoadDW(addr, value, res)  \
+#define     _LoadDW(addr, value, res)  \
+do {                                                        \
                __asm__ __volatile__ (                      \
                        ".set\tpush\n\t"                    \
                        ".set\tnoat\n\t"                    \
@@ -317,16 +335,19 @@ extern void show_registers(struct pt_regs *regs);
                        STR(PTR)"\t8b, 11b\n\t"             \
                        ".previous"                         \
                        : "=&r" (value), "=r" (res)         \
-                       : "r" (addr), "i" (-EFAULT));
+                       : "r" (addr), "i" (-EFAULT));       \
+} while(0)
+
 #endif /* CONFIG_CPU_MIPSR6 */
 
 
-#define     StoreHW(addr, value, res) \
+#define     _StoreHW(addr, value, res, type) \
+do {                                                        \
                __asm__ __volatile__ (                      \
                        ".set\tnoat\n"                      \
-                       "1:\t"user_sb("%1", "1(%2)")"\n"    \
+                       "1:\t"type##_sb("%1", "1(%2)")"\n"  \
                        "srl\t$1, %1, 0x8\n"                \
-                       "2:\t"user_sb("$1", "0(%2)")"\n"    \
+                       "2:\t"type##_sb("$1", "0(%2)")"\n"  \
                        ".set\tat\n\t"                      \
                        "li\t%0, 0\n"                       \
                        "3:\n\t"                            \
@@ -340,13 +361,15 @@ extern void show_registers(struct pt_regs *regs);
                        STR(PTR)"\t2b, 4b\n\t"              \
                        ".previous"                         \
                        : "=r" (res)                        \
-                       : "r" (value), "r" (addr), "i" (-EFAULT));
+                       : "r" (value), "r" (addr), "i" (-EFAULT));\
+} while(0)
 
 #ifndef CONFIG_CPU_MIPSR6
-#define     StoreW(addr, value, res)  \
+#define     _StoreW(addr, value, res, type)  \
+do {                                                        \
                __asm__ __volatile__ (                      \
-                       "1:\t"user_swl("%1", "(%2)")"\n"    \
-                       "2:\t"user_swr("%1", "3(%2)")"\n\t" \
+                       "1:\t"type##_swl("%1", "(%2)")"\n"  \
+                       "2:\t"type##_swr("%1", "3(%2)")"\n\t"\
                        "li\t%0, 0\n"                       \
                        "3:\n\t"                            \
                        ".insn\n\t"                         \
@@ -359,9 +382,11 @@ extern void show_registers(struct pt_regs *regs);
                        STR(PTR)"\t2b, 4b\n\t"              \
                        ".previous"                         \
                : "=r" (res)                                \
-               : "r" (value), "r" (addr), "i" (-EFAULT));
+               : "r" (value), "r" (addr), "i" (-EFAULT));  \
+} while(0)
 
-#define     StoreDW(addr, value, res) \
+#define     _StoreDW(addr, value, res) \
+do {                                                        \
                __asm__ __volatile__ (                      \
                        "1:\tsdl\t%1,(%2)\n"                \
                        "2:\tsdr\t%1, 7(%2)\n\t"            \
@@ -377,20 +402,23 @@ extern void show_registers(struct pt_regs *regs);
                        STR(PTR)"\t2b, 4b\n\t"              \
                        ".previous"                         \
                : "=r" (res)                                \
-               : "r" (value), "r" (addr), "i" (-EFAULT));
+               : "r" (value), "r" (addr), "i" (-EFAULT));  \
+} while(0)
+
 #else
 /* MIPSR6 has no swl and sdl instructions */
-#define     StoreW(addr, value, res)  \
+#define     _StoreW(addr, value, res, type)  \
+do {                                                        \
                __asm__ __volatile__ (                      \
                        ".set\tpush\n\t"                    \
                        ".set\tnoat\n\t"                    \
-                       "1:"user_sb("%1", "3(%2)")"\n\t"    \
+                       "1:"type##_sb("%1", "3(%2)")"\n\t"  \
                        "srl\t$1, %1, 0x8\n\t"              \
-                       "2:"user_sb("$1", "2(%2)")"\n\t"    \
+                       "2:"type##_sb("$1", "2(%2)")"\n\t"  \
                        "srl\t$1, $1,  0x8\n\t"             \
-                       "3:"user_sb("$1", "1(%2)")"\n\t"    \
+                       "3:"type##_sb("$1", "1(%2)")"\n\t"  \
                        "srl\t$1, $1, 0x8\n\t"              \
-                       "4:"user_sb("$1", "0(%2)")"\n\t"    \
+                       "4:"type##_sb("$1", "0(%2)")"\n\t"  \
                        ".set\tpop\n\t"                     \
                        "li\t%0, 0\n"                       \
                        "10:\n\t"                           \
@@ -407,9 +435,11 @@ extern void show_registers(struct pt_regs *regs);
                        ".previous"                         \
                : "=&r" (res)                               \
                : "r" (value), "r" (addr), "i" (-EFAULT)    \
-               : "memory");
+               : "memory");                                \
+} while(0)
 
 #define     StoreDW(addr, value, res) \
+do {                                                        \
                __asm__ __volatile__ (                      \
                        ".set\tpush\n\t"                    \
                        ".set\tnoat\n\t"                    \
@@ -449,15 +479,18 @@ extern void show_registers(struct pt_regs *regs);
                        ".previous"                         \
                : "=&r" (res)                               \
                : "r" (value), "r" (addr), "i" (-EFAULT)    \
-               : "memory");
+               : "memory");                                \
+} while(0)
+
 #endif /* CONFIG_CPU_MIPSR6 */
 
 #else /* __BIG_ENDIAN */
 
-#define     LoadHW(addr, value, res)  \
+#define     _LoadHW(addr, value, res, type)  \
+do {                                                        \
                __asm__ __volatile__ (".set\tnoat\n"        \
-                       "1:\t"user_lb("%0", "1(%2)")"\n"    \
-                       "2:\t"user_lbu("$1", "0(%2)")"\n\t" \
+                       "1:\t"type##_lb("%0", "1(%2)")"\n"  \
+                       "2:\t"type##_lbu("$1", "0(%2)")"\n\t"\
                        "sll\t%0, 0x8\n\t"                  \
                        "or\t%0, $1\n\t"                    \
                        "li\t%1, 0\n"                       \
@@ -472,13 +505,15 @@ extern void show_registers(struct pt_regs *regs);
                        STR(PTR)"\t2b, 4b\n\t"              \
                        ".previous"                         \
                        : "=&r" (value), "=r" (res)         \
-                       : "r" (addr), "i" (-EFAULT));
+                       : "r" (addr), "i" (-EFAULT));       \
+} while(0)
 
 #ifndef CONFIG_CPU_MIPSR6
-#define     LoadW(addr, value, res)   \
+#define     _LoadW(addr, value, res, type)   \
+do {                                                        \
                __asm__ __volatile__ (                      \
-                       "1:\t"user_lwl("%0", "3(%2)")"\n"   \
-                       "2:\t"user_lwr("%0", "(%2)")"\n\t"  \
+                       "1:\t"type##_lwl("%0", "3(%2)")"\n" \
+                       "2:\t"type##_lwr("%0", "(%2)")"\n\t"\
                        "li\t%1, 0\n"                       \
                        "3:\n\t"                            \
                        ".insn\n\t"                         \
@@ -491,21 +526,24 @@ extern void show_registers(struct pt_regs *regs);
                        STR(PTR)"\t2b, 4b\n\t"              \
                        ".previous"                         \
                        : "=&r" (value), "=r" (res)         \
-                       : "r" (addr), "i" (-EFAULT));
+                       : "r" (addr), "i" (-EFAULT));       \
+} while(0)
+
 #else
 /* MIPSR6 has no lwl instruction */
-#define     LoadW(addr, value, res) \
+#define     _LoadW(addr, value, res, type) \
+do {                                                        \
                __asm__ __volatile__ (                      \
                        ".set\tpush\n"                      \
                        ".set\tnoat\n\t"                    \
-                       "1:"user_lb("%0", "3(%2)")"\n\t"    \
-                       "2:"user_lbu("$1", "2(%2)")"\n\t"   \
+                       "1:"type##_lb("%0", "3(%2)")"\n\t"  \
+                       "2:"type##_lbu("$1", "2(%2)")"\n\t" \
                        "sll\t%0, 0x8\n\t"                  \
                        "or\t%0, $1\n\t"                    \
-                       "3:"user_lbu("$1", "1(%2)")"\n\t"   \
+                       "3:"type##_lbu("$1", "1(%2)")"\n\t" \
                        "sll\t%0, 0x8\n\t"                  \
                        "or\t%0, $1\n\t"                    \
-                       "4:"user_lbu("$1", "0(%2)")"\n\t"   \
+                       "4:"type##_lbu("$1", "0(%2)")"\n\t" \
                        "sll\t%0, 0x8\n\t"                  \
                        "or\t%0, $1\n\t"                    \
                        "li\t%1, 0\n"                       \
@@ -523,15 +561,18 @@ extern void show_registers(struct pt_regs *regs);
                        STR(PTR)"\t4b, 11b\n\t"             \
                        ".previous"                         \
                        : "=&r" (value), "=r" (res)         \
-                       : "r" (addr), "i" (-EFAULT));
+                       : "r" (addr), "i" (-EFAULT));       \
+} while(0)
+
 #endif /* CONFIG_CPU_MIPSR6 */
 
 
-#define     LoadHWU(addr, value, res) \
+#define     _LoadHWU(addr, value, res, type) \
+do {                                                        \
                __asm__ __volatile__ (                      \
                        ".set\tnoat\n"                      \
-                       "1:\t"user_lbu("%0", "1(%2)")"\n"   \
-                       "2:\t"user_lbu("$1", "0(%2)")"\n\t" \
+                       "1:\t"type##_lbu("%0", "1(%2)")"\n" \
+                       "2:\t"type##_lbu("$1", "0(%2)")"\n\t"\
                        "sll\t%0, 0x8\n\t"                  \
                        "or\t%0, $1\n\t"                    \
                        "li\t%1, 0\n"                       \
@@ -547,13 +588,15 @@ extern void show_registers(struct pt_regs *regs);
                        STR(PTR)"\t2b, 4b\n\t"              \
                        ".previous"                         \
                        : "=&r" (value), "=r" (res)         \
-                       : "r" (addr), "i" (-EFAULT));
+                       : "r" (addr), "i" (-EFAULT));       \
+} while(0)
 
 #ifndef CONFIG_CPU_MIPSR6
-#define     LoadWU(addr, value, res)  \
+#define     _LoadWU(addr, value, res, type)  \
+do {                                                        \
                __asm__ __volatile__ (                      \
-                       "1:\t"user_lwl("%0", "3(%2)")"\n"   \
-                       "2:\t"user_lwr("%0", "(%2)")"\n\t"  \
+                       "1:\t"type##_lwl("%0", "3(%2)")"\n" \
+                       "2:\t"type##_lwr("%0", "(%2)")"\n\t"\
                        "dsll\t%0, %0, 32\n\t"              \
                        "dsrl\t%0, %0, 32\n\t"              \
                        "li\t%1, 0\n"                       \
@@ -568,9 +611,11 @@ extern void show_registers(struct pt_regs *regs);
                        STR(PTR)"\t2b, 4b\n\t"              \
                        ".previous"                         \
                        : "=&r" (value), "=r" (res)         \
-                       : "r" (addr), "i" (-EFAULT));
+                       : "r" (addr), "i" (-EFAULT));       \
+} while(0)
 
-#define     LoadDW(addr, value, res)  \
+#define     _LoadDW(addr, value, res)  \
+do {                                                        \
                __asm__ __volatile__ (                      \
                        "1:\tldl\t%0, 7(%2)\n"              \
                        "2:\tldr\t%0, (%2)\n\t"             \
@@ -586,21 +631,24 @@ extern void show_registers(struct pt_regs *regs);
                        STR(PTR)"\t2b, 4b\n\t"              \
                        ".previous"                         \
                        : "=&r" (value), "=r" (res)         \
-                       : "r" (addr), "i" (-EFAULT));
+                       : "r" (addr), "i" (-EFAULT));       \
+} while(0)
+
 #else
 /* MIPSR6 has not lwl and ldl instructions */
-#define            LoadWU(addr, value, res) \
+#define            _LoadWU(addr, value, res, type) \
+do {                                                        \
                __asm__ __volatile__ (                      \
                        ".set\tpush\n\t"                    \
                        ".set\tnoat\n\t"                    \
-                       "1:"user_lbu("%0", "3(%2)")"\n\t"   \
-                       "2:"user_lbu("$1", "2(%2)")"\n\t"   \
+                       "1:"type##_lbu("%0", "3(%2)")"\n\t" \
+                       "2:"type##_lbu("$1", "2(%2)")"\n\t" \
                        "sll\t%0, 0x8\n\t"                  \
                        "or\t%0, $1\n\t"                    \
-                       "3:"user_lbu("$1", "1(%2)")"\n\t"   \
+                       "3:"type##_lbu("$1", "1(%2)")"\n\t" \
                        "sll\t%0, 0x8\n\t"                  \
                        "or\t%0, $1\n\t"                    \
-                       "4:"user_lbu("$1", "0(%2)")"\n\t"   \
+                       "4:"type##_lbu("$1", "0(%2)")"\n\t" \
                        "sll\t%0, 0x8\n\t"                  \
                        "or\t%0, $1\n\t"                    \
                        "li\t%1, 0\n"                       \
@@ -618,9 +666,11 @@ extern void show_registers(struct pt_regs *regs);
                        STR(PTR)"\t4b, 11b\n\t"             \
                        ".previous"                         \
                        : "=&r" (value), "=r" (res)         \
-                       : "r" (addr), "i" (-EFAULT));
+                       : "r" (addr), "i" (-EFAULT));       \
+} while(0)
 
-#define     LoadDW(addr, value, res)  \
+#define     _LoadDW(addr, value, res)  \
+do {                                                        \
                __asm__ __volatile__ (                      \
                        ".set\tpush\n\t"                    \
                        ".set\tnoat\n\t"                    \
@@ -665,15 +715,17 @@ extern void show_registers(struct pt_regs *regs);
                        STR(PTR)"\t8b, 11b\n\t"             \
                        ".previous"                         \
                        : "=&r" (value), "=r" (res)         \
-                       : "r" (addr), "i" (-EFAULT));
+                       : "r" (addr), "i" (-EFAULT));       \
+} while(0)
 #endif /* CONFIG_CPU_MIPSR6 */
 
-#define     StoreHW(addr, value, res) \
+#define     _StoreHW(addr, value, res, type) \
+do {                                                        \
                __asm__ __volatile__ (                      \
                        ".set\tnoat\n"                      \
-                       "1:\t"user_sb("%1", "0(%2)")"\n"    \
+                       "1:\t"type##_sb("%1", "0(%2)")"\n"  \
                        "srl\t$1,%1, 0x8\n"                 \
-                       "2:\t"user_sb("$1", "1(%2)")"\n"    \
+                       "2:\t"type##_sb("$1", "1(%2)")"\n"  \
                        ".set\tat\n\t"                      \
                        "li\t%0, 0\n"                       \
                        "3:\n\t"                            \
@@ -687,12 +739,15 @@ extern void show_registers(struct pt_regs *regs);
                        STR(PTR)"\t2b, 4b\n\t"              \
                        ".previous"                         \
                        : "=r" (res)                        \
-                       : "r" (value), "r" (addr), "i" (-EFAULT));
+                       : "r" (value), "r" (addr), "i" (-EFAULT));\
+} while(0)
+
 #ifndef CONFIG_CPU_MIPSR6
-#define     StoreW(addr, value, res)  \
+#define     _StoreW(addr, value, res, type)  \
+do {                                                        \
                __asm__ __volatile__ (                      \
-                       "1:\t"user_swl("%1", "3(%2)")"\n"   \
-                       "2:\t"user_swr("%1", "(%2)")"\n\t"  \
+                       "1:\t"type##_swl("%1", "3(%2)")"\n" \
+                       "2:\t"type##_swr("%1", "(%2)")"\n\t"\
                        "li\t%0, 0\n"                       \
                        "3:\n\t"                            \
                        ".insn\n\t"                         \
@@ -705,9 +760,11 @@ extern void show_registers(struct pt_regs *regs);
                        STR(PTR)"\t2b, 4b\n\t"              \
                        ".previous"                         \
                : "=r" (res)                                \
-               : "r" (value), "r" (addr), "i" (-EFAULT));
+               : "r" (value), "r" (addr), "i" (-EFAULT));  \
+} while(0)
 
-#define     StoreDW(addr, value, res) \
+#define     _StoreDW(addr, value, res) \
+do {                                                        \
                __asm__ __volatile__ (                      \
                        "1:\tsdl\t%1, 7(%2)\n"              \
                        "2:\tsdr\t%1, (%2)\n\t"             \
@@ -723,20 +780,23 @@ extern void show_registers(struct pt_regs *regs);
                        STR(PTR)"\t2b, 4b\n\t"              \
                        ".previous"                         \
                : "=r" (res)                                \
-               : "r" (value), "r" (addr), "i" (-EFAULT));
+               : "r" (value), "r" (addr), "i" (-EFAULT));  \
+} while(0)
+
 #else
 /* MIPSR6 has no swl and sdl instructions */
-#define     StoreW(addr, value, res)  \
+#define     _StoreW(addr, value, res, type)  \
+do {                                                        \
                __asm__ __volatile__ (                      \
                        ".set\tpush\n\t"                    \
                        ".set\tnoat\n\t"                    \
-                       "1:"user_sb("%1", "0(%2)")"\n\t"    \
+                       "1:"type##_sb("%1", "0(%2)")"\n\t"  \
                        "srl\t$1, %1, 0x8\n\t"              \
-                       "2:"user_sb("$1", "1(%2)")"\n\t"    \
+                       "2:"type##_sb("$1", "1(%2)")"\n\t"  \
                        "srl\t$1, $1,  0x8\n\t"             \
-                       "3:"user_sb("$1", "2(%2)")"\n\t"    \
+                       "3:"type##_sb("$1", "2(%2)")"\n\t"  \
                        "srl\t$1, $1, 0x8\n\t"              \
-                       "4:"user_sb("$1", "3(%2)")"\n\t"    \
+                       "4:"type##_sb("$1", "3(%2)")"\n\t"  \
                        ".set\tpop\n\t"                     \
                        "li\t%0, 0\n"                       \
                        "10:\n\t"                           \
@@ -753,9 +813,11 @@ extern void show_registers(struct pt_regs *regs);
                        ".previous"                         \
                : "=&r" (res)                               \
                : "r" (value), "r" (addr), "i" (-EFAULT)    \
-               : "memory");
+               : "memory");                                \
+} while(0)
 
-#define     StoreDW(addr, value, res) \
+#define     _StoreDW(addr, value, res) \
+do {                                                        \
                __asm__ __volatile__ (                      \
                        ".set\tpush\n\t"                    \
                        ".set\tnoat\n\t"                    \
@@ -795,10 +857,28 @@ extern void show_registers(struct pt_regs *regs);
                        ".previous"                         \
                : "=&r" (res)                               \
                : "r" (value), "r" (addr), "i" (-EFAULT)    \
-               : "memory");
+               : "memory");                                \
+} while(0)
+
 #endif /* CONFIG_CPU_MIPSR6 */
 #endif
 
+#define LoadHWU(addr, value, res)      _LoadHWU(addr, value, res, kernel)
+#define LoadHWUE(addr, value, res)     _LoadHWU(addr, value, res, user)
+#define LoadWU(addr, value, res)       _LoadWU(addr, value, res, kernel)
+#define LoadWUE(addr, value, res)      _LoadWU(addr, value, res, user)
+#define LoadHW(addr, value, res)       _LoadHW(addr, value, res, kernel)
+#define LoadHWE(addr, value, res)      _LoadHW(addr, value, res, user)
+#define LoadW(addr, value, res)                _LoadW(addr, value, res, kernel)
+#define LoadWE(addr, value, res)       _LoadW(addr, value, res, user)
+#define LoadDW(addr, value, res)       _LoadDW(addr, value, res)
+
+#define StoreHW(addr, value, res)      _StoreHW(addr, value, res, kernel)
+#define StoreHWE(addr, value, res)     _StoreHW(addr, value, res, user)
+#define StoreW(addr, value, res)       _StoreW(addr, value, res, kernel)
+#define StoreWE(addr, value, res)      _StoreW(addr, value, res, user)
+#define StoreDW(addr, value, res)      _StoreDW(addr, value, res)
+
 static void emulate_load_store_insn(struct pt_regs *regs,
        void __user *addr, unsigned int __user *pc)
 {
@@ -870,7 +950,7 @@ static void emulate_load_store_insn(struct pt_regs *regs,
                                set_fs(seg);
                                goto sigbus;
                        }
-                       LoadHW(addr, value, res);
+                       LoadHWE(addr, value, res);
                        if (res) {
                                set_fs(seg);
                                goto fault;
@@ -883,7 +963,7 @@ static void emulate_load_store_insn(struct pt_regs *regs,
                                set_fs(seg);
                                goto sigbus;
                        }
-                               LoadW(addr, value, res);
+                               LoadWE(addr, value, res);
                        if (res) {
                                set_fs(seg);
                                goto fault;
@@ -896,7 +976,7 @@ static void emulate_load_store_insn(struct pt_regs *regs,
                                set_fs(seg);
                                goto sigbus;
                        }
-                       LoadHWU(addr, value, res);
+                       LoadHWUE(addr, value, res);
                        if (res) {
                                set_fs(seg);
                                goto fault;
@@ -911,7 +991,7 @@ static void emulate_load_store_insn(struct pt_regs *regs,
                        }
                        compute_return_epc(regs);
                        value = regs->regs[insn.spec3_format.rt];
-                       StoreHW(addr, value, res);
+                       StoreHWE(addr, value, res);
                        if (res) {
                                set_fs(seg);
                                goto fault;
@@ -924,7 +1004,7 @@ static void emulate_load_store_insn(struct pt_regs *regs,
                        }
                        compute_return_epc(regs);
                        value = regs->regs[insn.spec3_format.rt];
-                       StoreW(addr, value, res);
+                       StoreWE(addr, value, res);
                        if (res) {
                                set_fs(seg);
                                goto fault;
@@ -941,7 +1021,15 @@ static void emulate_load_store_insn(struct pt_regs *regs,
                if (!access_ok(VERIFY_READ, addr, 2))
                        goto sigbus;
 
-               LoadHW(addr, value, res);
+               if (config_enabled(CONFIG_EVA)) {
+                       if (segment_eq(get_fs(), get_ds()))
+                               LoadHW(addr, value, res);
+                       else
+                               LoadHWE(addr, value, res);
+               } else {
+                       LoadHW(addr, value, res);
+               }
+
                if (res)
                        goto fault;
                compute_return_epc(regs);
@@ -952,7 +1040,15 @@ static void emulate_load_store_insn(struct pt_regs *regs,
                if (!access_ok(VERIFY_READ, addr, 4))
                        goto sigbus;
 
-               LoadW(addr, value, res);
+               if (config_enabled(CONFIG_EVA)) {
+                       if (segment_eq(get_fs(), get_ds()))
+                               LoadW(addr, value, res);
+                       else
+                               LoadWE(addr, value, res);
+               } else {
+                       LoadW(addr, value, res);
+               }
+
                if (res)
                        goto fault;
                compute_return_epc(regs);
@@ -963,7 +1059,15 @@ static void emulate_load_store_insn(struct pt_regs *regs,
                if (!access_ok(VERIFY_READ, addr, 2))
                        goto sigbus;
 
-               LoadHWU(addr, value, res);
+               if (config_enabled(CONFIG_EVA)) {
+                       if (segment_eq(get_fs(), get_ds()))
+                               LoadHWU(addr, value, res);
+                       else
+                               LoadHWUE(addr, value, res);
+               } else {
+                       LoadHWU(addr, value, res);
+               }
+
                if (res)
                        goto fault;
                compute_return_epc(regs);
@@ -1022,7 +1126,16 @@ static void emulate_load_store_insn(struct pt_regs *regs,
 
                compute_return_epc(regs);
                value = regs->regs[insn.i_format.rt];
-               StoreHW(addr, value, res);
+
+               if (config_enabled(CONFIG_EVA)) {
+                       if (segment_eq(get_fs(), get_ds()))
+                               StoreHW(addr, value, res);
+                       else
+                               StoreHWE(addr, value, res);
+               } else {
+                       StoreHW(addr, value, res);
+               }
+
                if (res)
                        goto fault;
                break;
@@ -1033,7 +1146,16 @@ static void emulate_load_store_insn(struct pt_regs *regs,
 
                compute_return_epc(regs);
                value = regs->regs[insn.i_format.rt];
-               StoreW(addr, value, res);
+
+               if (config_enabled(CONFIG_EVA)) {
+                       if (segment_eq(get_fs(), get_ds()))
+                               StoreW(addr, value, res);
+                       else
+                               StoreWE(addr, value, res);
+               } else {
+                       StoreW(addr, value, res);
+               }
+
                if (res)
                        goto fault;
                break;