[PATCH] arm64: cpufeature: remove non-exist CONFIG_KVM_ARM_HOST

Marc Zyngier maz at kernel.org
Mon Jan 4 07:40:46 EST 2021


On 2021-01-04 11:38, Shannon Zhao wrote:
> 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.
> 
> Signed-off-by: Shannon Zhao <shannon.zhao at linux.alibaba.com>
> ---
>  arch/arm64/kernel/cpufeature.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/kernel/cpufeature.c 
> b/arch/arm64/kernel/cpufeature.c
> index 7ffb5f1..e99edde 100644
> --- a/arch/arm64/kernel/cpufeature.c
> +++ b/arch/arm64/kernel/cpufeature.c
> @@ -2568,7 +2568,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);

Well spotted. It means this function has never run since v5.8.
It only performs a sanity check, but still...

Thanks,

         M.
-- 
Jazz is not dead. It just smells funny...



More information about the linux-arm-kernel mailing list