| From 0249e3e9fb145b0b7ec9c71ae93ef22867992099 Mon Sep 17 00:00:00 2001 |
| From: Russell King <rmk+kernel@armlinux.org.uk> |
| Date: Fri, 25 Jan 2019 17:40:37 -0500 |
| Subject: ARM: fix the cockup in the previous patch |
| |
| Commit d6951f582cc50ba0ad22ef46b599740966599b14 upstream. |
| |
| The intention in the previous patch was to only place the processor |
| tables in the .rodata section if big.Little was being built and we |
| wanted the branch target hardening, but instead (due to the way it |
| was tested) it ended up always placing the tables into the .rodata |
| section. |
| |
| Although harmless, let's correct this anyway. |
| |
| Fixes: 3a4d0c2172bc ("ARM: ensure that processor vtables is not lost after boot") |
| Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> |
| Signed-off-by: David A. Long <dave.long@linaro.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| arch/arm/mm/proc-macros.S | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/arch/arm/mm/proc-macros.S |
| +++ b/arch/arm/mm/proc-macros.S |
| @@ -278,7 +278,7 @@ |
| * If we are building for big.Little with branch predictor hardening, |
| * we need the processor function tables to remain available after boot. |
| */ |
| -#if 1 // defined(CONFIG_BIG_LITTLE) && defined(CONFIG_HARDEN_BRANCH_PREDICTOR) |
| +#if defined(CONFIG_BIG_LITTLE) && defined(CONFIG_HARDEN_BRANCH_PREDICTOR) |
| .section ".rodata" |
| #endif |
| .type \name\()_processor_functions, #object |
| @@ -316,7 +316,7 @@ ENTRY(\name\()_processor_functions) |
| .endif |
| |
| .size \name\()_processor_functions, . - \name\()_processor_functions |
| -#if 1 // defined(CONFIG_BIG_LITTLE) && defined(CONFIG_HARDEN_BRANCH_PREDICTOR) |
| +#if defined(CONFIG_BIG_LITTLE) && defined(CONFIG_HARDEN_BRANCH_PREDICTOR) |
| .previous |
| #endif |
| .endm |
