diff options
| author | Mark Brown <broonie@kernel.org> | 2018-12-11 23:44:49 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-12-11 23:44:49 +0300 |
| commit | e6202e8249aa7115af65f2d80b43c132816224ef (patch) | |
| tree | 8865dd722ad55bb5e6bd5d446057395336ed0169 /arch/arm/mm/proc-macros.S | |
| parent | 2b96edb570709d6ca2e06842941c4bdf04b55f47 (diff) | |
| parent | d407c81adae57041ba82577e604e351f36b8afce (diff) | |
| download | linux-e6202e8249aa7115af65f2d80b43c132816224ef.tar.xz | |
Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-4.21
Diffstat (limited to 'arch/arm/mm/proc-macros.S')
| -rw-r--r-- | arch/arm/mm/proc-macros.S | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S index 81d0efb055c6..19516fbc2c55 100644 --- a/arch/arm/mm/proc-macros.S +++ b/arch/arm/mm/proc-macros.S @@ -274,6 +274,13 @@ .endm .macro define_processor_functions name:req, dabort:req, pabort:req, nommu=0, suspend=0, bugs=0 +/* + * 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) + .section ".rodata" +#endif .type \name\()_processor_functions, #object .align 2 ENTRY(\name\()_processor_functions) @@ -309,6 +316,9 @@ ENTRY(\name\()_processor_functions) .endif .size \name\()_processor_functions, . - \name\()_processor_functions +#if 1 // defined(CONFIG_BIG_LITTLE) && defined(CONFIG_HARDEN_BRANCH_PREDICTOR) + .previous +#endif .endm .macro define_cache_functions name:req |