Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlaf Hering <ohering@suse.de>2017-10-20 12:20:33 +0200
committerOlaf Hering <ohering@suse.de>2017-10-20 12:23:29 +0200
commit22a35fa0a3083e667f0571e9355264f979a13c11 (patch)
treed9eea10e1aa04ce2de069890ededeb7a7b9c430c
parent0aa3f1f664bf8a6b7b7bb496313a5eeb68e1307d (diff)
x86/hyper-v: Remove duplicated
HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED definition (fate#323887).
-rw-r--r--patches.suse/msft-hv-1464-x86-hyper-v-Remove-duplicated-HV_X64_EX_PROCESSOR_MA.patch46
-rw-r--r--series.conf1
2 files changed, 47 insertions, 0 deletions
diff --git a/patches.suse/msft-hv-1464-x86-hyper-v-Remove-duplicated-HV_X64_EX_PROCESSOR_MA.patch b/patches.suse/msft-hv-1464-x86-hyper-v-Remove-duplicated-HV_X64_EX_PROCESSOR_MA.patch
new file mode 100644
index 0000000000..737334dc77
--- /dev/null
+++ b/patches.suse/msft-hv-1464-x86-hyper-v-Remove-duplicated-HV_X64_EX_PROCESSOR_MA.patch
@@ -0,0 +1,46 @@
+From: Vitaly Kuznetsov <vkuznets@redhat.com>
+Date: Mon, 11 Sep 2017 17:06:20 +0200
+Patch-mainline: v4.14-rc1
+Subject: x86/hyper-v: Remove duplicated HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED definition
+Git-commit: 1278f58cdee63cfbb04e5624474a291c81a7a13b
+References: fate#323887
+
+Commits:
+
+ 7dcf90e9e032 ("PCI: hv: Use vPCI protocol version 1.2")
+ 628f54cc6451 ("x86/hyper-v: Support extended CPU ranges for TLB flush hypercalls")
+
+added the same definition and they came in through different trees.
+Fix the duplication.
+
+Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
+Cc: Haiyang Zhang <haiyangz@microsoft.com>
+Cc: K. Y. Srinivasan <kys@microsoft.com>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Stephen Hemminger <sthemmin@microsoft.com>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Cc: devel@linuxdriverproject.org
+Link: http://lkml.kernel.org/r/20170911150620.3998-1-vkuznets@redhat.com
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Acked-by: Olaf Hering <ohering@suse.de>
+---
+ arch/x86/include/uapi/asm/hyperv.h | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/arch/x86/include/uapi/asm/hyperv.h b/arch/x86/include/uapi/asm/hyperv.h
+--- a/arch/x86/include/uapi/asm/hyperv.h
++++ b/arch/x86/include/uapi/asm/hyperv.h
+@@ -152,12 +152,6 @@
+ /* Recommend using the newer ExProcessorMasks interface */
+ #define HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED (1 << 11)
+
+-/*
+- * HV_VP_SET available
+- */
+-#define HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED (1 << 11)
+-
+-
+ /*
+ * Crash notification flag.
+ */
diff --git a/series.conf b/series.conf
index 6b5c3f0d51..908ec1c782 100644
--- a/series.conf
+++ b/series.conf
@@ -1711,6 +1711,7 @@
patches.suse/msft-hv-1460-hv_netvsc-Fix-the-channel-limit-in-netvsc_set_rxfh.patch
patches.suse/msft-hv-1461-hv_netvsc-fix-deadlock-on-hotplug.patch
patches.suse/msft-hv-1462-hv_netvsc-avoid-unnecessary-wakeups-on-subchannel-cr.patch
+ patches.suse/msft-hv-1464-x86-hyper-v-Remove-duplicated-HV_X64_EX_PROCESSOR_MA.patch
patches.suse/suse-hv-guest-os-id.patch
patches.suse/suse-hv-kvp_on_msg.dbg.patch