Skip to content

Commit be0e16c

Browse files
kattisrinivasanKAGA-KOKO
authored andcommitted
x86/hyper-v: Fix wrong merge conflict resolution
When the mapping betwween the Linux notion of CPU ID to the hypervisor's notion of CPU ID is not initialized, IPI must fall back to the non-enlightened path. The recent merge of upstream changes into the hyperv branch resolved a merge conflict wronly by returning success in that case, which results in the IPI not being sent at all. Fix it up. Fixes: 8f63e92 ("Merge branch 'x86/urgent' into x86/hyperv") Reported-by: Michael Kelley <[email protected]> Signed-off-by: K. Y. Srinivasan <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Link: https://lkml.kernel.org/r/[email protected]
1 parent 110d2a7 commit be0e16c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/x86/hyperv/hv_apic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ static bool __send_ipi_mask(const struct cpumask *mask, int vector)
168168
for_each_cpu(cur_cpu, mask) {
169169
vcpu = hv_cpu_number_to_vp_number(cur_cpu);
170170
if (vcpu == VP_INVAL)
171-
return true;
171+
return false;
172172

173173
/*
174174
* This particular version of the IPI hypercall can

0 commit comments

Comments
 (0)