1 files changed, 13 insertions, 2 deletions

diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h
index 29035e86a59d..62f8095d46de 100644
--- a/arch/arm/include/asm/assembler.h
+++ b/arch/arm/include/asm/assembler.h
@@ -187,6 +187,17 @@
 #endif
 
 /*
+ * Instruction barrier
+ */
+        .macro  instr_sync
+#if __LINUX_ARM_ARCH__ >= 7
+        isb
+#elif __LINUX_ARM_ARCH__ == 6
+        mcr     p15, 0, r0, c7, c5, 4
+#endif
+        .endm
+
+/*
  * SMP data memory barrier
  */
         .macro  smp_dmb mode
@@ -226,7 +237,7 @@
  */
 #ifdef CONFIG_THUMB2_KERNEL
 
-        .macro  usraccoff, instr, reg, ptr, inc, off, cond, abort, t=T()
+        .macro  usraccoff, instr, reg, ptr, inc, off, cond, abort, t=TUSER()
 9999:
         .if     \inc == 1
         \instr\cond\()b\()\t\().w \reg, [\ptr, #\off]
@@ -266,7 +277,7 @@
 
 #else   /* !CONFIG_THUMB2_KERNEL */
 
-        .macro  usracc, instr, reg, ptr, inc, cond, rept, abort, t=T()
+        .macro  usracc, instr, reg, ptr, inc, cond, rept, abort, t=TUSER()
         .rept   \rept
 9999:
         .if     \inc == 1