diff options
author | Matthijs van Duin <matthijsvanduin@gmail.com> | 2017-02-15 19:05:04 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-05-14 08:00:15 -0400 |
commit | ebae7681697dada6ca0afce8cbad57f2e96a451a (patch) | |
tree | bfa9caaf65463efd7183c6880fdc22d09124b92f | |
parent | f4bff2c44dc9e366e93734741021bf19d0f5604f (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>
-rw-r--r-- | arch/arm/mach-omap2/omap-headsmp.S | 3 |
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 @@ | |||
17 | 17 | ||
18 | #include <linux/linkage.h> | 18 | #include <linux/linkage.h> |
19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
20 | #include <asm/assembler.h> | ||
20 | 21 | ||
21 | #include "omap44xx.h" | 22 | #include "omap44xx.h" |
22 | 23 | ||
@@ -66,7 +67,7 @@ wait_2: ldr r2, =AUX_CORE_BOOT0_PA @ read from AuxCoreBoot0 | |||
66 | cmp r0, r4 | 67 | cmp r0, r4 |
67 | bne wait_2 | 68 | bne wait_2 |
68 | ldr r12, =API_HYP_ENTRY | 69 | ldr r12, =API_HYP_ENTRY |
69 | adr r0, hyp_boot | 70 | badr r0, hyp_boot |
70 | smc #0 | 71 | smc #0 |
71 | hyp_boot: | 72 | hyp_boot: |
72 | b omap_secondary_startup | 73 | b omap_secondary_startup |