projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| b74db2ac GKH |
1 | From 448c077eeb02240c430db2a2c3bf5285a4c65d66 Mon Sep 17 00:00:00 2001 |
| 2 | From: Matthijs van Duin <matthijsvanduin@gmail.com> | |
| 3 | Date: Thu, 16 Feb 2017 01:05:04 +0100 | |
| 4 | Subject: ARM: OMAP5 / DRA7: Fix HYP mode boot for thumb2 build | |
| 5 | ||
| 6 | From: Matthijs van Duin <matthijsvanduin@gmail.com> | |
| 7 | ||
| 8 | commit 448c077eeb02240c430db2a2c3bf5285a4c65d66 upstream. | |
| 9 | ||
| 10 | 'adr' yields a data-pointer, not a function-pointer. | |
| 11 | ||
| 12 | Fixes: 999f934de195 ("ARM: omap5/dra7xx: Enable booting secondary | |
| 13 | CPU in HYP mode") | |
| 14 | Signed-off-by: Matthijs van Duin <matthijsvanduin@gmail.com> | |
| 15 | Signed-off-by: Tony Lindgren <tony@atomide.com> | |
| 16 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 17 | ||
| 18 | --- | |
| 19 | arch/arm/mach-omap2/omap-headsmp.S | 3 ++- | |
| 20 | 1 file changed, 2 insertions(+), 1 deletion(-) | |
| 21 | ||
| 22 | --- a/arch/arm/mach-omap2/omap-headsmp.S | |
| 23 | +++ b/arch/arm/mach-omap2/omap-headsmp.S | |
| 24 | @@ -17,6 +17,7 @@ | |
| 25 | ||
| 26 | #include <linux/linkage.h> | |
| 27 | #include <linux/init.h> | |
| 28 | +#include <asm/assembler.h> | |
| 29 | ||
| 30 | #include "omap44xx.h" | |
| 31 | ||
| 32 | @@ -66,7 +67,7 @@ wait_2: ldr r2, =AUX_CORE_BOOT0_PA @ rea | |
| 33 | cmp r0, r4 | |
| 34 | bne wait_2 | |
| 35 | ldr r12, =API_HYP_ENTRY | |
| 36 | - adr r0, hyp_boot | |
| 37 | + badr r0, hyp_boot | |
| 38 | smc #0 | |
| 39 | hyp_boot: | |
| 40 | b omap_secondary_startup |