projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
arch
/
arm
/
include
/
asm
/
assembler.h
diff --git
a/arch/arm/include/asm/assembler.h
b/arch/arm/include/asm/assembler.h
index
4eaea21
..
68b06f9
100644
(file)
--- a/
arch/arm/include/asm/assembler.h
+++ b/
arch/arm/include/asm/assembler.h
@@
-159,7
+159,11
@@
.endm
.macro save_and_disable_irqs_notrace, oldcpsr
+#ifdef CONFIG_CPU_V7M
+ mrs \oldcpsr, primask
+#else
mrs \oldcpsr, cpsr
+#endif
disable_irq_notrace
.endm