From: Sascha Hauer <[email protected]>

3.12-stable review patch.  If anyone has any objections, please let me know.

===============

commit 5616f36713ea77f57ae908bf2fef641364403c9f upstream.

The secondary CPU starts up in ARM mode. When the kernel is compiled in
thumb2 mode we have to explicitly compile the secondary startup
trampoline in ARM mode, otherwise the CPU will go to Nirvana.

Signed-off-by: Sascha Hauer <[email protected]>
Reported-by: Steffen Trumtrar <[email protected]>
Suggested-by: Ard Biesheuvel <[email protected]>
Signed-off-by: Dinh Nguyen <[email protected]>
Signed-off-by: Kevin Hilman <[email protected]>
Signed-off-by: Jiri Slaby <[email protected]>
---
 arch/arm/mach-socfpga/headsmp.S | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/mach-socfpga/headsmp.S b/arch/arm/mach-socfpga/headsmp.S
index 95c115d8b5ee..b143f946bb79 100644
--- a/arch/arm/mach-socfpga/headsmp.S
+++ b/arch/arm/mach-socfpga/headsmp.S
@@ -11,6 +11,7 @@
 #include <linux/init.h>
 
        .arch   armv7-a
+       .arm
 
 ENTRY(secondary_trampoline)
        movw    r2, #:lower16:cpu1start_addr
-- 
2.8.2

Reply via email to