Commit 778a136e authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Paolo Bonzini

KVM: SVM: Drop unneeded CONFIG_X86_LOCAL_APIC check

AVIC dependency on CONFIG_X86_LOCAL_APIC is dead code since
commit e42eef4b ("KVM: add X86_LOCAL_APIC dependency").
Suggested-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Message-Id: <20210518144339.1987982-2-vkuznets@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarSean Christopherson <seanjc@google.com>
parent a4345a7c
...@@ -29,9 +29,7 @@ ...@@ -29,9 +29,7 @@
/* enable / disable AVIC */ /* enable / disable AVIC */
int avic; int avic;
#ifdef CONFIG_X86_LOCAL_APIC
module_param(avic, int, S_IRUGO); module_param(avic, int, S_IRUGO);
#endif
#define SVM_AVIC_DOORBELL 0xc001011b #define SVM_AVIC_DOORBELL 0xc001011b
......
...@@ -1010,9 +1010,7 @@ static __init int svm_hardware_setup(void) ...@@ -1010,9 +1010,7 @@ static __init int svm_hardware_setup(void)
} }
if (avic) { if (avic) {
if (!npt_enabled || if (!npt_enabled || !boot_cpu_has(X86_FEATURE_AVIC)) {
!boot_cpu_has(X86_FEATURE_AVIC) ||
!IS_ENABLED(CONFIG_X86_LOCAL_APIC)) {
avic = false; avic = false;
} else { } else {
pr_info("AVIC enabled\n"); pr_info("AVIC enabled\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment