X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=blobdiff_plain;f=arch%2Farm%2Finclude%2Fasm%2Fassembler.h;h=68b06f9c65ded6c810421a79b345e16f77e3d527;hp=4eaea2173bf81e84d47f0453299a538b08d08e87;hb=fed41f7d039bad02f94cad9059e4b14cd81d13f2;hpb=b09c412aa4540d13b677a9f4af05f59048b78949

diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h
index 4eaea2173bf8..68b06f9c65de 100644
--- 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