1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
index b293616a1a1..2958976d867 100644
--- a/arch/arm/include/asm/uaccess.h
+++ b/arch/arm/include/asm/uaccess.h
@@ -227,7 +227,7 @@ do {									\
 #define __get_user_asm_byte(x,addr,err)                         \
        __asm__ __volatile__(                                   \
-        "1:     " T(ldrb) "     %1,[%2],#0\n"                   \
+        "1:     " TUSER(ldrb) " %1,[%2],#0\n"                   \
        "2:\n"                                                  \
        "       .pushsection .fixup,\"ax\"\n"                   \
        "       .align  2\n"                                    \
@@ -263,7 +263,7 @@ do {									\
 #define __get_user_asm_word(x,addr,err)                         \
        __asm__ __volatile__(                                   \
-        "1:     " T(ldr) "      %1,[%2],#0\n"                   \
+        "1:     " TUSER(ldr) "  %1,[%2],#0\n"                   \
        "2:\n"                                                  \
        "       .pushsection .fixup,\"ax\"\n"                   \
        "       .align  2\n"                                    \
@@ -308,7 +308,7 @@ do {									\
 #define __put_user_asm_byte(x,__pu_addr,err)                    \
        __asm__ __volatile__(                                   \
-        "1:     " T(strb) "     %1,[%2],#0\n"                   \
+        "1:     " TUSER(strb) " %1,[%2],#0\n"                   \
        "2:\n"                                                  \
        "       .pushsection .fixup,\"ax\"\n"                   \
        "       .align  2\n"                                    \
@@ -341,7 +341,7 @@ do {									\
 #define __put_user_asm_word(x,__pu_addr,err)                    \
        __asm__ __volatile__(                                   \
-        "1:     " T(str) "      %1,[%2],#0\n"                   \
+        "1:     " TUSER(str) "  %1,[%2],#0\n"                   \
        "2:\n"                                                  \
        "       .pushsection .fixup,\"ax\"\n"                   \
        "       .align  2\n"                                    \
@@ -366,10 +366,10 @@ do {									\
 #define __put_user_asm_dword(x,__pu_addr,err)                   \
        __asm__ __volatile__(                                   \
- ARM(   "1:     " T(str) "      " __reg_oper1 ", [%1], #4\n"    )       \
+ ARM(   "1:     " TUSER(str) "  " __reg_oper1 ", [%1], #4\n"    ) \
- ARM(   "2:     " T(str) "      " __reg_oper0 ", [%1]\n"        )       \
+ ARM(   "2:     " TUSER(str) "  " __reg_oper0 ", [%1]\n"        ) \
- THUMB( "1:     " T(str) "      " __reg_oper1 ", [%1]\n"        )       \
+ THUMB( "1:     " TUSER(str) "  " __reg_oper1 ", [%1]\n"        ) \
- THUMB( "2:     " T(str) "      " __reg_oper0 ", [%1, #4]\n"    )       \
+ THUMB( "2:     " TUSER(str) "  " __reg_oper0 ", [%1, #4]\n"    ) \
        "3:\n"                                                  \
        "       .pushsection .fixup,\"ax\"\n"                   \
        "       .align  2\n"                                    \

diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h index b293616a1a1..2958976d867 100644 --- a/arch/arm/include/asm/uaccess.h +++ b/arch/arm/include/asm/uaccess.h
@@ -227,7 +227,7 @@ do { \
227		227
228	#define __get_user_asm_byte(x,addr,err) \	228	#define __get_user_asm_byte(x,addr,err) \
229	__asm__ __volatile__( \	229	__asm__ __volatile__( \
230	"1: " T(ldrb) " %1,[%2],#0\n" \	230	"1: " TUSER(ldrb) " %1,[%2],#0\n" \
231	"2:\n" \	231	"2:\n" \
232	" .pushsection .fixup,\"ax\"\n" \	232	" .pushsection .fixup,\"ax\"\n" \
233	" .align 2\n" \	233	" .align 2\n" \
@@ -263,7 +263,7 @@ do { \
263		263
264	#define __get_user_asm_word(x,addr,err) \	264	#define __get_user_asm_word(x,addr,err) \
265	__asm__ __volatile__( \	265	__asm__ __volatile__( \
266	"1: " T(ldr) " %1,[%2],#0\n" \	266	"1: " TUSER(ldr) " %1,[%2],#0\n" \
267	"2:\n" \	267	"2:\n" \
268	" .pushsection .fixup,\"ax\"\n" \	268	" .pushsection .fixup,\"ax\"\n" \
269	" .align 2\n" \	269	" .align 2\n" \
@@ -308,7 +308,7 @@ do { \
308		308
309	#define __put_user_asm_byte(x,__pu_addr,err) \	309	#define __put_user_asm_byte(x,__pu_addr,err) \
310	__asm__ __volatile__( \	310	__asm__ __volatile__( \
311	"1: " T(strb) " %1,[%2],#0\n" \	311	"1: " TUSER(strb) " %1,[%2],#0\n" \
312	"2:\n" \	312	"2:\n" \
313	" .pushsection .fixup,\"ax\"\n" \	313	" .pushsection .fixup,\"ax\"\n" \
314	" .align 2\n" \	314	" .align 2\n" \
@@ -341,7 +341,7 @@ do { \
341		341
342	#define __put_user_asm_word(x,__pu_addr,err) \	342	#define __put_user_asm_word(x,__pu_addr,err) \
343	__asm__ __volatile__( \	343	__asm__ __volatile__( \
344	"1: " T(str) " %1,[%2],#0\n" \	344	"1: " TUSER(str) " %1,[%2],#0\n" \
345	"2:\n" \	345	"2:\n" \
346	" .pushsection .fixup,\"ax\"\n" \	346	" .pushsection .fixup,\"ax\"\n" \
347	" .align 2\n" \	347	" .align 2\n" \
@@ -366,10 +366,10 @@ do { \
366		366
367	#define __put_user_asm_dword(x,__pu_addr,err) \	367	#define __put_user_asm_dword(x,__pu_addr,err) \
368	__asm__ __volatile__( \	368	__asm__ __volatile__( \
369	ARM( "1: " T(str) " " __reg_oper1 ", [%1], #4\n" ) \	369	ARM( "1: " TUSER(str) " " __reg_oper1 ", [%1], #4\n" ) \
370	ARM( "2: " T(str) " " __reg_oper0 ", [%1]\n" ) \	370	ARM( "2: " TUSER(str) " " __reg_oper0 ", [%1]\n" ) \
371	THUMB( "1: " T(str) " " __reg_oper1 ", [%1]\n" ) \	371	THUMB( "1: " TUSER(str) " " __reg_oper1 ", [%1]\n" ) \
372	THUMB( "2: " T(str) " " __reg_oper0 ", [%1, #4]\n" ) \	372	THUMB( "2: " TUSER(str) " " __reg_oper0 ", [%1, #4]\n" ) \
373	"3:\n" \	373	"3:\n" \
374	" .pushsection .fixup,\"ax\"\n" \	374	" .pushsection .fixup,\"ax\"\n" \
375	" .align 2\n" \	375	" .align 2\n" \