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

Commit b72f711a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'spectre' of git://git.armlinux.org.uk/~rmk/linux-arm 

Pull ARM spectre fix from Russell King:
 "Exynos folk noticed that CPU hotplug wasn't working with their kernel
  configuration, and have tested this as fixing the problem"

* 'spectre' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: ensure that processor vtables is not lost after boot
parents 7e40b56c 3a4d0c21

arch/arm/mm/proc-macros.S

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