From: Thomas Gleixner <tglx@linutronix.de>
Date: Fri, 6 Jul 2018 10:35:56 +0000 (+0200)
Subject: Merge branch 'x86/urgent' into x86/hyperv
X-Git-Tag: v4.19-rc1~199^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8f63e9230decb06ea9068feaf0845c0eb39ab890;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'x86/urgent' into x86/hyperv

Integrate the upstream bug fix to resolve the resulting conflict in
__send_ipi_mask().

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

8f63e9230decb06ea9068feaf0845c0eb39ab890
diff --cc arch/x86/hyperv/hv_apic.c
index 657a2b8c738a5,4023383656511..0c3c9f8fee77b
--- a/arch/x86/hyperv/hv_apic.c
+++ b/arch/x86/hyperv/hv_apic.c
@@@ -165,6 -160,9 +167,9 @@@ static bool __send_ipi_mask(const struc
  
  	for_each_cpu(cur_cpu, mask) {
  		vcpu = hv_cpu_number_to_vp_number(cur_cpu);
+ 		if (vcpu == VP_INVAL)
 -			goto ipi_mask_done;
++			return true;
+ 
  		/*
  		 * This particular version of the IPI hypercall can
  		 * only target upto 64 CPUs.