Commit-ID: 1278f58cdee63cfbb04e5624474a291c81a7a13b
Gitweb: http://git.kernel.org/tip/1278f58cdee63cfbb04e5624474a291c81a7a13b
Author: Vitaly Kuznetsov <vkuzn...@redhat.com>
AuthorDate: Mon, 11 Sep 2017 17:06:20 +0200
Committer: Ingo Molnar <mi...@kernel.org>
CommitDate: Wed, 13 Sep 2017 11:29:46 +0200
x86/hyper-v: Remove duplicated HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED definition
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 <vkuzn...@redhat.com>
Cc: Haiyang Zhang <haiya...@microsoft.com>
Cc: K. Y. Srinivasan <k...@microsoft.com>
Cc: Linus Torvalds <torva...@linux-foundation.org>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Stephen Hemminger <sthem...@microsoft.com>
Cc: Thomas Gleixner <t...@linutronix.de>
Cc: de...@linuxdriverproject.org
Link: http://lkml.kernel.org/r/20170911150620.3998-1-vkuzn...@redhat.com
Signed-off-by: Ingo Molnar <mi...@kernel.org>
---
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
index 7032f4d..f65d125 100644
--- a/arch/x86/include/uapi/asm/hyperv.h
+++ b/arch/x86/include/uapi/asm/hyperv.h
@@ -153,12 +153,6 @@
#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.
*/
#define HV_CRASH_CTL_CRASH_NOTIFY (1ULL << 63)
