[PATCH 4.10 035/129] ARM: OMAP5 / DRA7: Fix HYP mode boot for thumb2 build

From: Greg Kroah-Hartman
Date: Thu May 11 2017 - 10:17:33 EST


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

------------------

From: Matthijs van Duin <matthijsvanduin@xxxxxxxxx>

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@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

---
arch/arm/mach-omap2/omap-headsmp.S | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

--- 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 @ rea
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