diff options
| author | David Lin <dtwlin@google.com> | 2018-07-12 16:57:35 -0700 |
|---|---|---|
| committer | David Lin <dtwlin@google.com> | 2018-07-12 16:57:35 -0700 |
| commit | 794c011620b40342405cdffeb043e59a6df8dfdf (patch) | |
| tree | 4842195f745e3cca9c425f884acd752d2f31d6ac /arch/arm64/kernel/smp.c | |
| parent | 169e98a55701a04a2c2cf019313a3e2fef25735c (diff) | |
| parent | 2df594f4e913d972534a17919c83885ad3124cb4 (diff) | |
Merge branch 'android-msm-bullhead-3.10-security-next' into android-msm-bullhead-3.10
September 2018.1
Bug: 110909354
Change-Id: I9e764529ca03931d029685270567fbdf320e1337
Diffstat (limited to 'arch/arm64/kernel/smp.c')
| -rw-r--r-- | arch/arm64/kernel/smp.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c index 797585eb45f5..c690c89c7599 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@ -39,6 +39,7 @@ #include <asm/atomic.h> #include <asm/cacheflush.h> +#include <asm/cpufeature.h> #include <asm/cputype.h> #include <asm/cpu_ops.h> #include <asm/mmu_context.h> @@ -161,6 +162,11 @@ asmlinkage void __cpuinit secondary_start_kernel(void) if (cpu_ops[cpu]->cpu_postboot) cpu_ops[cpu]->cpu_postboot(); +#ifdef CONFIG_HARDEN_BRANCH_PREDICTOR + if (sys_psci_bp_hardening_initialised) + enable_psci_bp_hardening(NULL); +#endif + /* * Log the CPU info before it is marked online and might get read. */ @@ -321,6 +327,7 @@ void __ref cpu_die(void) void __init smp_cpus_done(unsigned int max_cpus) { pr_info("SMP: Total of %d processors activated.\n", num_online_cpus()); + setup_cpu_features(); } void __init smp_prepare_boot_cpu(void) |