Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 7 insertions, 6 deletions

diff --git a/arch/arm/lib/getuser.S b/arch/arm/lib/getuser.S
index b1631a7dbe75..1b049cd7a49a 100644
--- a/arch/arm/lib/getuser.S
+++ b/arch/arm/lib/getuser.S
@@ -28,20 +28,21 @@
  */
 #include <linux/linkage.h>
 #include <asm/errno.h>
+#include <asm/domain.h>
 
 ENTRY(__get_user_1)
-1:      ldrbt   r2, [r0]
+1:      T(ldrb) r2, [r0]
         mov     r0, #0
         mov     pc, lr
 ENDPROC(__get_user_1)
 
 ENTRY(__get_user_2)
 #ifdef CONFIG_THUMB2_KERNEL
-2:      ldrbt   r2, [r0]
-3:      ldrbt   r3, [r0, #1]
+2:      T(ldrb) r2, [r0]
+3:      T(ldrb) r3, [r0, #1]
 #else
-2:      ldrbt   r2, [r0], #1
-3:      ldrbt   r3, [r0]
+2:      T(ldrb) r2, [r0], #1
+3:      T(ldrb) r3, [r0]
 #endif
 #ifndef __ARMEB__
         orr     r2, r2, r3, lsl #8
@@ -53,7 +54,7 @@ ENTRY(__get_user_2)
 ENDPROC(__get_user_2)
 
 ENTRY(__get_user_4)
-4:      ldrt    r2, [r0]
+4:      T(ldr)  r2, [r0]
         mov     r0, #0
         mov     pc, lr
 ENDPROC(__get_user_4)