diff options
Diffstat (limited to 'arch/x86/kernel/apic/apic.c')
-rw-r--r-- | arch/x86/kernel/apic/apic.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index 3f838d537392..8408f2d19819 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c | |||
@@ -50,8 +50,8 @@ | |||
50 | #include <asm/mtrr.h> | 50 | #include <asm/mtrr.h> |
51 | #include <asm/smp.h> | 51 | #include <asm/smp.h> |
52 | #include <asm/mce.h> | 52 | #include <asm/mce.h> |
53 | #include <asm/kvm_para.h> | ||
54 | #include <asm/tsc.h> | 53 | #include <asm/tsc.h> |
54 | #include <asm/hypervisor.h> | ||
55 | 55 | ||
56 | unsigned int num_processors; | 56 | unsigned int num_processors; |
57 | 57 | ||
@@ -1476,7 +1476,8 @@ void __init enable_IR_x2apic(void) | |||
1476 | /* IR is required if there is APIC ID > 255 even when running | 1476 | /* IR is required if there is APIC ID > 255 even when running |
1477 | * under KVM | 1477 | * under KVM |
1478 | */ | 1478 | */ |
1479 | if (max_physical_apicid > 255 || !kvm_para_available()) | 1479 | if (max_physical_apicid > 255 || |
1480 | !hypervisor_x2apic_available()) | ||
1480 | goto nox2apic; | 1481 | goto nox2apic; |
1481 | /* | 1482 | /* |
1482 | * without IR all CPUs can be addressed by IOAPIC/MSI | 1483 | * without IR all CPUs can be addressed by IOAPIC/MSI |