On Tue, 2021-05-18 at 16:43 +0200, Vitaly Kuznetsov wrote: > AVIC dependency on CONFIG_X86_LOCAL_APIC is dead code since > commit e42eef4ba388 ("KVM: add X86_LOCAL_APIC dependency"). Indeed! Reviewed-by: Maxim Levitsky <mlevitsk@xxxxxxxxxx> Best regards, Maxim Levitsky > > Suggested-by: Sean Christopherson <seanjc@xxxxxxxxxx> > Signed-off-by: Vitaly Kuznetsov <vkuznets@xxxxxxxxxx> > --- > arch/x86/kvm/svm/avic.c | 2 -- > arch/x86/kvm/svm/svm.c | 4 +--- > 2 files changed, 1 insertion(+), 5 deletions(-) > > diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c > index 712b4e0de481..1c1bf911e02b 100644 > --- a/arch/x86/kvm/svm/avic.c > +++ b/arch/x86/kvm/svm/avic.c > @@ -29,9 +29,7 @@ > > /* enable / disable AVIC */ > int avic; > -#ifdef CONFIG_X86_LOCAL_APIC > module_param(avic, int, S_IRUGO); > -#endif > > #define SVM_AVIC_DOORBELL 0xc001011b > > diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c > index dfa351e605de..8c3918a11826 100644 > --- a/arch/x86/kvm/svm/svm.c > +++ b/arch/x86/kvm/svm/svm.c > @@ -1010,9 +1010,7 @@ static __init int svm_hardware_setup(void) > } > > if (avic) { > - if (!npt_enabled || > - !boot_cpu_has(X86_FEATURE_AVIC) || > - !IS_ENABLED(CONFIG_X86_LOCAL_APIC)) { > + if (!npt_enabled || !boot_cpu_has(X86_FEATURE_AVIC)) { > avic = false; > } else { > pr_info("AVIC enabled\n");