]> git.baikalelectronics.ru Git - kernel.git/commit
x86/hyper-v: Fix wrong merge conflict resolution
authorK. Y. Srinivasan <kys@microsoft.com>
Fri, 20 Jul 2018 03:50:09 +0000 (03:50 +0000)
committerThomas Gleixner <tglx@linutronix.de>
Fri, 20 Jul 2018 04:56:23 +0000 (06:56 +0200)
commit096860ccaafea71b19ad0281b0625b0903933637
tree3290813349a78e71218a8ff5f31949ade14c97f2
parent286bee65c16567dc19ebde1e4166af8cac1a1a67
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: 5cad6fd0dc71 ("Merge branch 'x86/urgent' into x86/hyperv")
Reported-by: Michael Kelley <mikelley@microsoft.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: gregkh@linuxfoundation.org
Cc: devel@linuxdriverproject.org
Cc: olaf@aepfle.de
Cc: apw@canonical.com
Cc: jasowang@redhat.com
Cc: hpa@zytor.com
Cc: sthemmin@microsoft.com
Cc: Michael.H.Kelley@microsoft.com
Cc: vkuznets@redhat.com
Link: https://lkml.kernel.org/r/20180720035009.3995-1-kys@linuxonhyperv.com
arch/x86/hyperv/hv_apic.c