summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2016-04-20 13:34:31 +0000
committerSasha Levin <sasha.levin@oracle.com>2016-05-17 13:42:47 -0400
commit5bde3f2abca17e834c4009d4fdc71e8edb6df8f0 (patch)
tree0f8fc2d2b3a5ed3e05265fc75dd5c6c7374d6e28
parent3b54e5f0a5415a9a8b8618fa61d1303e2ba8add6 (diff)
ARM: SoCFPGA: Fix secondary CPU startup in thumb2 kernel
[ Upstream commit 5616f36713ea77f57ae908bf2fef641364403c9f ] 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> Cc: stable@vger.kernel.org Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> Signed-off-by: Kevin Hilman <khilman@baylibre.com> Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
-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 5bb016427107..e01316bbef61 100644
--- a/arch/arm/mach-socfpga/headsmp.S
+++ b/arch/arm/mach-socfpga/headsmp.S
@@ -12,6 +12,7 @@
#include <asm/memory.h>
.arch armv7-a
+ .arm
ENTRY(secondary_trampoline)
/* CPU1 will always fetch from 0x0 when it is brought out of reset.