[PATCH] x86/hyper-v: Remove doubled HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED definition

From	Vitaly Kuznetsov <vkuznets@redhat.com>
Newsgroups	linux.kernel
Subject	[PATCH] x86/hyper-v: Remove doubled HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED definition
Date	2017-09-11 17:10 +0200
Message-ID	<uoyvw-531-3@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

Commit 7dcf90e9e032 ("PCI: hv: Use vPCI protocol version 1.2") and
commit 628f54cc6451 ("x86/hyper-v: Support extended CPU ranges for TLB
flush hypercalls") adding the same definition came through different
trees. Fix the glitch.

Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
---
 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 7032f4d8dff3..f65d12504e80 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)
-- 
2.13.5

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] x86/hyper-v: Remove doubled HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED definition Vitaly Kuznetsov <vkuznets@redhat.com> - 2017-09-11 17:10 +0200
  [tip:x86/urgent] x86/hyper-v: Remove duplicated  HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED definition tip-bot for Vitaly Kuznetsov <tipbot@zytor.com> - 2017-09-13 12:20 +0200

csiph-web