summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorShannon Zhao <shannon.zhao@linux.alibaba.com>2021-01-04 14:38:44 +0300
committerMarc Zyngier <maz@kernel.org>2021-01-05 16:22:07 +0300
commit45ba7b195a369f35cb39094fdb32efe5908b34ad (patch)
treeea0093ef81983ba8ca5968a3a17c509b27cf495b /arch
parent8cbebc4118b5933b3ae6351ceb433f75ac6b7c6b (diff)
downloadlinux-45ba7b195a369f35cb39094fdb32efe5908b34ad.tar.xz
arm64: cpufeature: remove non-exist CONFIG_KVM_ARM_HOST
Commit d82755b2e781 ("KVM: arm64: Kill off CONFIG_KVM_ARM_HOST") deletes CONFIG_KVM_ARM_HOST option, it should use CONFIG_KVM instead. Just remove CONFIG_KVM_ARM_HOST here. Fixes: d82755b2e781 ("KVM: arm64: Kill off CONFIG_KVM_ARM_HOST") Signed-off-by: Shannon Zhao <shannon.zhao@linux.alibaba.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Marc Zyngier <maz@kernel.org> Link: https://lore.kernel.org/r/1609760324-92271-1-git-send-email-shannon.zhao@linux.alibaba.com
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/kernel/cpufeature.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
index d96f4554282d..bc3549663957 100644
--- a/arch/arm64/kernel/cpufeature.c
+++ b/arch/arm64/kernel/cpufeature.c
@@ -2558,7 +2558,7 @@ static void verify_hyp_capabilities(void)
int parange, ipa_max;
unsigned int safe_vmid_bits, vmid_bits;
- if (!IS_ENABLED(CONFIG_KVM) || !IS_ENABLED(CONFIG_KVM_ARM_HOST))
+ if (!IS_ENABLED(CONFIG_KVM))
return;
safe_mmfr1 = read_sanitised_ftr_reg(SYS_ID_AA64MMFR1_EL1);