aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/assembler.h
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/include/asm/assembler.h')
-rw-r--r--arch/arm/include/asm/assembler.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h
index b6e65dedfd71..23371b17b23e 100644
--- a/arch/arm/include/asm/assembler.h
+++ b/arch/arm/include/asm/assembler.h
@@ -137,6 +137,11 @@
137 disable_irq 137 disable_irq
138 .endm 138 .endm
139 139
140 .macro save_and_disable_irqs_notrace, oldcpsr
141 mrs \oldcpsr, cpsr
142 disable_irq_notrace
143 .endm
144
140/* 145/*
141 * Restore interrupt state previously stored in a register. We don't 146 * Restore interrupt state previously stored in a register. We don't
142 * guarantee that this will preserve the flags. 147 * guarantee that this will preserve the flags.
@@ -237,7 +242,7 @@
237 */ 242 */
238#ifdef CONFIG_THUMB2_KERNEL 243#ifdef CONFIG_THUMB2_KERNEL
239 244
240 .macro usraccoff, instr, reg, ptr, inc, off, cond, abort, t=T() 245 .macro usraccoff, instr, reg, ptr, inc, off, cond, abort, t=TUSER()
2419999: 2469999:
242 .if \inc == 1 247 .if \inc == 1
243 \instr\cond\()b\()\t\().w \reg, [\ptr, #\off] 248 \instr\cond\()b\()\t\().w \reg, [\ptr, #\off]
@@ -277,7 +282,7 @@
277 282
278#else /* !CONFIG_THUMB2_KERNEL */ 283#else /* !CONFIG_THUMB2_KERNEL */
279 284
280 .macro usracc, instr, reg, ptr, inc, cond, rept, abort, t=T() 285 .macro usracc, instr, reg, ptr, inc, cond, rept, abort, t=TUSER()
281 .rept \rept 286 .rept \rept
2829999: 2879999:
283 .if \inc == 1 288 .if \inc == 1