summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorMatthijs van Duin <matthijsvanduin@gmail.com>2017-02-16 01:05:04 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-05-14 14:00:15 +0200
commitebae7681697dada6ca0afce8cbad57f2e96a451a (patch)
treebfa9caaf65463efd7183c6880fdc22d09124b92f /arch/arm
parentf4bff2c44dc9e366e93734741021bf19d0f5604f (diff)
ARM: OMAP5 / DRA7: Fix HYP mode boot for thumb2 build
commit 448c077eeb02240c430db2a2c3bf5285a4c65d66 upstream. 'adr' yields a data-pointer, not a function-pointer. Fixes: 999f934de195 ("ARM: omap5/dra7xx: Enable booting secondary CPU in HYP mode") Signed-off-by: Matthijs van Duin <matthijsvanduin@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-omap2/omap-headsmp.S3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/omap-headsmp.S b/arch/arm/mach-omap2/omap-headsmp.S
index fe36ce2734d4..4c6f14cf92a8 100644
--- a/arch/arm/mach-omap2/omap-headsmp.S
+++ b/arch/arm/mach-omap2/omap-headsmp.S
@@ -17,6 +17,7 @@
#include <linux/linkage.h>
#include <linux/init.h>
+#include <asm/assembler.h>
#include "omap44xx.h"
@@ -66,7 +67,7 @@ wait_2: ldr r2, =AUX_CORE_BOOT0_PA @ read from AuxCoreBoot0
cmp r0, r4
bne wait_2
ldr r12, =API_HYP_ENTRY
- adr r0, hyp_boot
+ badr r0, hyp_boot
smc #0
hyp_boot:
b omap_secondary_startup