x86/hyper-v: Fix wrong merge conflict resolution

[sfrench/cifs-2.6.git] / arch / x86 / hyperv / hv_apic.c

diff --git a/arch/x86/hyperv/hv_apic.c b/arch/x86/hyperv/hv_apic.c
index 0c3c9f8fee77bbeaf2db91072b32b3c70d9205ee..5b0f613428c252291379e9bbb7cc664c929ce07f 100644 (file)
--- a/arch/x86/hyperv/hv_apic.c
+++ b/arch/x86/hyperv/hv_apic.c
@@ -168,7 +168,7 @@ static bool __send_ipi_mask(const struct cpumask *mask, int vector)
        for_each_cpu(cur_cpu, mask) {
                vcpu = hv_cpu_number_to_vp_number(cur_cpu);
                if (vcpu == VP_INVAL)
-                       return true;
+                       return false;
 
                /*
                 * This particular version of the IPI hypercall can