Merge 5.17-rc6 into char-misc-next

[linux-2.6-microblaze.git] / arch / x86 / kernel / kvm.c

diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
index a438217..f734e3b 100644 (file)
--- a/arch/x86/kernel/kvm.c
+++ b/arch/x86/kernel/kvm.c
@@ -462,19 +462,22 @@ static bool pv_tlb_flush_supported(void)
 {
        return (kvm_para_has_feature(KVM_FEATURE_PV_TLB_FLUSH) &&
                !kvm_para_has_hint(KVM_HINTS_REALTIME) &&
-               kvm_para_has_feature(KVM_FEATURE_STEAL_TIME));
+               kvm_para_has_feature(KVM_FEATURE_STEAL_TIME) &&
+               (num_possible_cpus() != 1));
 }
 
 static bool pv_ipi_supported(void)
 {
-       return kvm_para_has_feature(KVM_FEATURE_PV_SEND_IPI);
+       return (kvm_para_has_feature(KVM_FEATURE_PV_SEND_IPI) &&
+              (num_possible_cpus() != 1));
 }
 
 static bool pv_sched_yield_supported(void)
 {
        return (kvm_para_has_feature(KVM_FEATURE_PV_SCHED_YIELD) &&
                !kvm_para_has_hint(KVM_HINTS_REALTIME) &&
-           kvm_para_has_feature(KVM_FEATURE_STEAL_TIME));
+           kvm_para_has_feature(KVM_FEATURE_STEAL_TIME) &&
+           (num_possible_cpus() != 1));
 }
 
 #define KVM_IPI_CLUSTER_SIZE   (2 * BITS_PER_LONG)