ARM: 7301/1: Rename the T() macro to TUSER() to avoid namespace conflicts

This macro is used to generate unprivileged accesses (LDRT/STRT) to user
space.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 14 insertions, 14 deletions

diff --git a/arch/arm/lib/putuser.S b/arch/arm/lib/putuser.S
index c023fc11e86c..7db25990c589 100644
--- a/arch/arm/lib/putuser.S
+++ b/arch/arm/lib/putuser.S
@@ -31,7 +31,7 @@
 #include <asm/domain.h>
 
 ENTRY(__put_user_1)
-1:      T(strb) r2, [r0]
+1: TUSER(strb)  r2, [r0]
         mov     r0, #0
         mov     pc, lr
 ENDPROC(__put_user_1)
@@ -40,19 +40,19 @@ ENTRY(__put_user_2)
         mov     ip, r2, lsr #8
 #ifdef CONFIG_THUMB2_KERNEL
 #ifndef __ARMEB__
-2:      T(strb) r2, [r0]
-3:      T(strb) ip, [r0, #1]
+2: TUSER(strb)  r2, [r0]
+3: TUSER(strb)  ip, [r0, #1]
 #else
-2:      T(strb) ip, [r0]
-3:      T(strb) r2, [r0, #1]
+2: TUSER(strb)  ip, [r0]
+3: TUSER(strb)  r2, [r0, #1]
 #endif
 #else   /* !CONFIG_THUMB2_KERNEL */
 #ifndef __ARMEB__
-2:      T(strb) r2, [r0], #1
-3:      T(strb) ip, [r0]
+2: TUSER(strb)  r2, [r0], #1
+3: TUSER(strb)  ip, [r0]
 #else
-2:      T(strb) ip, [r0], #1
-3:      T(strb) r2, [r0]
+2: TUSER(strb)  ip, [r0], #1
+3: TUSER(strb)  r2, [r0]
 #endif
 #endif  /* CONFIG_THUMB2_KERNEL */
         mov     r0, #0
@@ -60,18 +60,18 @@ ENTRY(__put_user_2)
 ENDPROC(__put_user_2)
 
 ENTRY(__put_user_4)
-4:      T(str)  r2, [r0]
+4: TUSER(str)   r2, [r0]
         mov     r0, #0
         mov     pc, lr
 ENDPROC(__put_user_4)
 
 ENTRY(__put_user_8)
 #ifdef CONFIG_THUMB2_KERNEL
-5:      T(str)  r2, [r0]
-6:      T(str)  r3, [r0, #4]
+5: TUSER(str)   r2, [r0]
+6: TUSER(str)   r3, [r0, #4]
 #else
-5:      T(str)  r2, [r0], #4
-6:      T(str)  r3, [r0]
+5: TUSER(str)   r2, [r0], #4
+6: TUSER(str)   r3, [r0]
 #endif
         mov     r0, #0
         mov     pc, lr