aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm64/kvm
diff options
context:
space:
mode:
authorWill Deacon <will@kernel.org>2020-09-15 23:00:31 +0100
committerWill Deacon <will@kernel.org>2020-09-29 16:08:16 +0100
commit9b0955baa4208abd72840c13c5f56a0f133c7cb3 (patch)
tree28159da777da7f5bc8a311de47d113c83f491de9 /arch/arm64/kvm
parentarm64: Treat SSBS as a non-strict system feature (diff)
downloadlinux-dev-9b0955baa4208abd72840c13c5f56a0f133c7cb3.tar.xz
linux-dev-9b0955baa4208abd72840c13c5f56a0f133c7cb3.zip
arm64: Rename ARM64_SSBD to ARM64_SPECTRE_V4
In a similar manner to the renaming of ARM64_HARDEN_BRANCH_PREDICTOR to ARM64_SPECTRE_V2, rename ARM64_SSBD to ARM64_SPECTRE_V4. This isn't _entirely_ accurate, as we also need to take into account the interaction with SSBS, but that will be taken care of in subsequent patches. Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch/arm64/kvm')
-rw-r--r--arch/arm64/kvm/hyp/include/hyp/switch.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kvm/hyp/include/hyp/switch.h b/arch/arm64/kvm/hyp/include/hyp/switch.h
index b503f19c37c5..5dec5589625d 100644
--- a/arch/arm64/kvm/hyp/include/hyp/switch.h
+++ b/arch/arm64/kvm/hyp/include/hyp/switch.h
@@ -481,7 +481,7 @@ exit:
static inline bool __needs_ssbd_off(struct kvm_vcpu *vcpu)
{
- if (!cpus_have_final_cap(ARM64_SSBD))
+ if (!cpus_have_final_cap(ARM64_SPECTRE_V4))
return false;
return !(vcpu->arch.workaround_flags & VCPU_WORKAROUND_2_FLAG);