diff options
| author |   Will Deacon <will@kernel.org> | 2020-09-15 22:11:13 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2020-09-29 16:08:15 +0100 |
| commit | 6e5f0927846adf39aebee450f13871e3cb4ab012 (patch) | |
| tree | 261a6871c7b1a509831ad48b9ec2ea0fe9204675 /arch/arm64/kvm/hyp/hyp-entry.S | |
| parent | arm64: Run ARCH_WORKAROUND_2 enabling code on all CPUs (diff) | |
| download | linux-dev-6e5f0927846adf39aebee450f13871e3cb4ab012.tar.xz linux-dev-6e5f0927846adf39aebee450f13871e3cb4ab012.zip | |
arm64: Remove Spectre-related CONFIG_* options
The spectre mitigations are too configurable for their own good, leading
to confusing logic trying to figure out when we should mitigate and when
we shouldn't. Although the plethora of command-line options need to stick
around for backwards compatibility, the default-on CONFIG options that
depend on EXPERT can be dropped, as the mitigations only do anything if
the system is vulnerable, a mitigation is available and the command-line
hasn't disabled it.
Remove CONFIG_HARDEN_BRANCH_PREDICTOR and CONFIG_ARM64_SSBD in favour of
enabling this code unconditionally.
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch/arm64/kvm/hyp/hyp-entry.S')
| -rw-r--r-- | arch/arm64/kvm/hyp/hyp-entry.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm64/kvm/hyp/hyp-entry.S b/arch/arm64/kvm/hyp/hyp-entry.S index 46b4dab933d0..41698bae5d5d 100644 --- a/arch/arm64/kvm/hyp/hyp-entry.S +++ b/arch/arm64/kvm/hyp/hyp-entry.S @@ -116,7 +116,6 @@ el1_hvc_guest: ARM_SMCCC_ARCH_WORKAROUND_2) cbnz w1, el1_trap -#ifdef CONFIG_ARM64_SSBD alternative_cb arm64_enable_wa2_handling b wa2_end alternative_cb_end @@ -143,7 +142,6 @@ alternative_cb_end wa2_end: mov x2, xzr mov x1, xzr -#endif wa_epilogue: mov x0, xzr |