aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/include/asm
diff options
context:
space:
mode:
authorK. Y. Srinivasan <kys@microsoft.com>2018-07-20 03:50:09 +0000
committerThomas Gleixner <tglx@linutronix.de>2018-07-20 06:56:23 +0200
commitbe0e16ce7c3bf9855f1ef5ae46cf889e1784ddea (patch)
tree3290813349a78e71218a8ff5f31949ade14c97f2 /arch/x86/include/asm
parent110d2a7fc39725d2c29d2fede4f34a35a4f98882 (diff)
download96b-common-be0e16ce7c3bf9855f1ef5ae46cf889e1784ddea.tar.gz
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: 8f63e9230dec ("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
Diffstat (limited to 'arch/x86/include/asm')
0 files changed, 0 insertions, 0 deletions