summaryrefslogtreecommitdiff
path: root/arch/arm/mach-socfpga/headsmp.S
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2016-04-20 13:34:31 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-05-11 11:21:14 +0200
commitdd86efc570e528de7931f9eb039fa0c91bb3c1bd (patch)
tree21d088288a9bd0b20b03ffb00c71f5e56875b5b0 /arch/arm/mach-socfpga/headsmp.S
parent63e9a60f4357e700a181980d424ffeaff32d5340 (diff)
ARM: SoCFPGA: Fix secondary CPU startup in thumb2 kernel
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 <s.hauer@pengutronix.de> Reported-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Suggested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> Signed-off-by: Kevin Hilman <khilman@baylibre.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/mach-socfpga/headsmp.S')
-rw-r--r--arch/arm/mach-socfpga/headsmp.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-socfpga/headsmp.S b/arch/arm/mach-socfpga/headsmp.S
index 5d94b7a2fb10..c160fa3007e9 100644
--- a/arch/arm/mach-socfpga/headsmp.S
+++ b/arch/arm/mach-socfpga/headsmp.S
@@ -13,6 +13,7 @@
#include <asm/assembler.h>
.arch armv7-a
+ .arm
ENTRY(secondary_trampoline)
/* CPU1 will always fetch from 0x0 when it is brought out of reset.