1 files changed, 6 insertions, 6 deletions

diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h
index 28a48e0d4cca..b59921a560da 100644
--- a/arch/arm/include/asm/assembler.h
+++ b/arch/arm/include/asm/assembler.h
@@ -376,9 +376,9 @@ THUMB(	orr	\reg , \reg , #PSR_T_BIT	)
         .macro  usraccoff, instr, reg, ptr, inc, off, cond, abort, t=TUSER()
 9999:
         .if     \inc == 1
-        \instr\cond\()b\()\t\().w \reg, [\ptr, #\off]
+        \instr\()b\t\cond\().w \reg, [\ptr, #\off]
         .elseif \inc == 4
-        \instr\cond\()\t\().w \reg, [\ptr, #\off]
+        \instr\t\cond\().w \reg, [\ptr, #\off]
         .else
         .error  "Unsupported inc macro argument"
         .endif
@@ -417,9 +417,9 @@ THUMB(	orr	\reg , \reg , #PSR_T_BIT	)
         .rept   \rept
 9999:
         .if     \inc == 1
-        \instr\cond\()b\()\t \reg, [\ptr], #\inc
+        \instr\()b\t\cond \reg, [\ptr], #\inc
         .elseif \inc == 4
-        \instr\cond\()\t \reg, [\ptr], #\inc
+        \instr\t\cond \reg, [\ptr], #\inc
         .else
         .error  "Unsupported inc macro argument"
         .endif
@@ -460,7 +460,7 @@ THUMB(	orr	\reg , \reg , #PSR_T_BIT	)
         .macro check_uaccess, addr:req, size:req, limit:req, tmp:req, bad:req
 #ifndef CONFIG_CPU_USE_DOMAINS
         adds    \tmp, \addr, #\size - 1
-        sbcccs  \tmp, \tmp, \limit
+        sbcscc  \tmp, \tmp, \limit
         bcs     \bad
 #ifdef CONFIG_CPU_SPECTRE
         movcs   \addr, #0
@@ -474,7 +474,7 @@ THUMB(	orr	\reg , \reg , #PSR_T_BIT	)
         sub     \tmp, \limit, #1
         subs    \tmp, \tmp, \addr       @ tmp = limit - 1 - addr
         addhs   \tmp, \tmp, #1          @ if (tmp >= 0) {
-        subhss  \tmp, \tmp, \size       @ tmp = limit - (addr + size) }
+        subshs  \tmp, \tmp, \size       @ tmp = limit - (addr + size) }
         movlo   \addr, #0               @ if (tmp < 0) addr = NULL
         csdb
 #endif