From: Vladimir Murzin <vladimir.murzin@arm.com>
Date: Tue, 30 Aug 2016 16:28:43 +0000 (+0100)
Subject: ARM: 8605/1: V7M: fix notrace variant of save_and_disable_irqs
X-Git-Tag: v4.9-rc1~115^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b2bf482a5099264fb75936b5b552cdf3c247c93a;p=thirdparty%2Flinux.git

ARM: 8605/1: V7M: fix notrace variant of save_and_disable_irqs

Commit 8e43a905 "ARM: 7325/1: fix v7 boot with lockdep enabled"
introduced notrace variant of save_and_disable_irqs to balance notrace
variant of restore_irqs; however V7M case has been missed. It was not
noticed because cache-v7.S the only place where notrace variant is used.
So fix it, since we are going to extend V7 cache routines to handle V7M
case too.

Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com>
Tested-by: Andras Szemzo <sza@esh.hu>
Tested-by: Joachim Eastwood <manabian@gmail.com>
Tested-by: Alexandre TORGUE <alexandre.torgue@st.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

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