summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2019-02-14 09:49:27 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-02-20 10:18:27 +0100
commit2dbc7e3efe2ca2e9eb614c66ea725c2116103b56 (patch)
treee78e3c9bf4eb9f98bb88d40bad78a3e38b2d72fb /arch/arm/kernel
parent15a669ff9b4c6ec66b2efed82428f596f2d19bbd (diff)
downloadlinux-stable-2dbc7e3efe2ca2e9eb614c66ea725c2116103b56.tar.gz
linux-stable-2dbc7e3efe2ca2e9eb614c66ea725c2116103b56.tar.bz2
linux-stable-2dbc7e3efe2ca2e9eb614c66ea725c2116103b56.zip
ARM: add PROC_VTABLE and PROC_TABLE macros
Commit e209950fdd065d2cc46e6338e47e52841b830cba upstream. Allow the way we access members of the processor vtable to be changed at compile time. We will need to move to per-CPU vtables to fix the Spectre variant 2 issues on big.Little systems. However, we have a couple of calls that do not need the vtable treatment, and indeed cause a kernel warning due to the (later) use of smp_processor_id(), so also introduce the PROC_TABLE macro for these which always use CPU 0's function pointers. Reviewed-by: Julien Thierry <julien.thierry@arm.com> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Signed-off-by: David A. Long <dave.long@linaro.org> Reviewed-by: Julien Thierry <julien.thierry@arm.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'arch/arm/kernel')
-rw-r--r--arch/arm/kernel/setup.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 8d5c3a118abe..2eebb67fa08b 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -693,9 +693,7 @@ static void __init setup_processor(void)
cpu_name = list->cpu_name;
__cpu_architecture = __get_cpu_architecture();
-#ifdef MULTI_CPU
- processor = *list->proc;
-#endif
+ init_proc_vtable(list->proc);
#ifdef MULTI_TLB
cpu_tlb = *list->tlb;
#endif