Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6951f58 authored by Russell King's avatar Russell King
Browse files

ARM: fix the cockup in the previous patch 



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: 3a4d0c21 ("ARM: ensure that processor vtables is not lost after boot")
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
parent 3a4d0c21

arch/arm/mm/proc-macros.S

+2 −2
Original line number Diff line number Diff line
@@ -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