| From a9ee8186607269c0bc5535d710061267cf7c232b Mon Sep 17 00:00:00 2001 |
| From: Matthijs van Duin <matthijsvanduin@gmail.com> |
| Date: Thu, 16 Feb 2017 01:05:04 +0100 |
| Subject: [PATCH] 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| 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 |
| -- |
| 2.12.0 |
| |
