summaryrefslogtreecommitdiff
path: root/arch/arm64/kvm/Kconfig
diff options
context:
space:
mode:
authorWill Deacon <will@kernel.org>2020-09-15 22:11:13 +0100
committerWill Deacon <will@kernel.org>2020-09-29 16:08:15 +0100
commit6e5f0927846adf39aebee450f13871e3cb4ab012 (patch)
tree261a6871c7b1a509831ad48b9ec2ea0fe9204675 /arch/arm64/kvm/Kconfig
parent39533e12063be7f55e3d6ae21ffe067799d542a4 (diff)
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/Kconfig')
-rw-r--r--arch/arm64/kvm/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig
index 318c8f2df245..42e5895763b3 100644
--- a/arch/arm64/kvm/Kconfig
+++ b/arch/arm64/kvm/Kconfig
@@ -58,7 +58,7 @@ config KVM_ARM_PMU
virtual machines.
config KVM_INDIRECT_VECTORS
- def_bool HARDEN_BRANCH_PREDICTOR || RANDOMIZE_BASE
+ def_bool RANDOMIZE_BASE
endif # KVM