diff options
-rw-r--r-- | arch/x86/kernel/kvm.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c index 82caf01b63dd..edd2179ad2da 100644 --- a/arch/x86/kernel/kvm.c +++ b/arch/x86/kernel/kvm.c | |||
@@ -308,9 +308,6 @@ static notrace void kvm_guest_apic_eoi_write(u32 reg, u32 val) | |||
308 | 308 | ||
309 | static void kvm_guest_cpu_init(void) | 309 | static void kvm_guest_cpu_init(void) |
310 | { | 310 | { |
311 | if (!kvm_para_available()) | ||
312 | return; | ||
313 | |||
314 | if (kvm_para_has_feature(KVM_FEATURE_ASYNC_PF) && kvmapf) { | 311 | if (kvm_para_has_feature(KVM_FEATURE_ASYNC_PF) && kvmapf) { |
315 | u64 pa = slow_virt_to_phys(this_cpu_ptr(&apf_reason)); | 312 | u64 pa = slow_virt_to_phys(this_cpu_ptr(&apf_reason)); |
316 | 313 | ||
@@ -625,9 +622,6 @@ static void __init kvm_guest_init(void) | |||
625 | { | 622 | { |
626 | int i; | 623 | int i; |
627 | 624 | ||
628 | if (!kvm_para_available()) | ||
629 | return; | ||
630 | |||
631 | paravirt_ops_setup(); | 625 | paravirt_ops_setup(); |
632 | register_reboot_notifier(&kvm_pv_reboot_nb); | 626 | register_reboot_notifier(&kvm_pv_reboot_nb); |
633 | for (i = 0; i < KVM_TASK_SLEEP_HASHSIZE; i++) | 627 | for (i = 0; i < KVM_TASK_SLEEP_HASHSIZE; i++) |
@@ -847,8 +841,6 @@ asm( | |||
847 | */ | 841 | */ |
848 | void __init kvm_spinlock_init(void) | 842 | void __init kvm_spinlock_init(void) |
849 | { | 843 | { |
850 | if (!kvm_para_available()) | ||
851 | return; | ||
852 | /* Does host kernel support KVM_FEATURE_PV_UNHALT? */ | 844 | /* Does host kernel support KVM_FEATURE_PV_UNHALT? */ |
853 | if (!kvm_para_has_feature(KVM_FEATURE_PV_UNHALT)) | 845 | if (!kvm_para_has_feature(KVM_FEATURE_PV_UNHALT)) |
854 | return; | 846 | return; |