x86/hyper-v: Remove doubled HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED definition
PATCH 1/1 x86/hyper-v: Remove doubled HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED definition
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 <[email protected]>
--- arch/x86/include/uapi/asm/hyperv.h | 6 ------ 1 file changed, 6 deletions(-)
arch/x86/include/uapi/asm/hyperv.h +0 -6
@@ -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)
Signature · 1 line
2.13.5
tip-bot for Vitaly Kuznetsov
merge bot[tip:x86/urgent] x86/hyper-v: Remove duplicated HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED definition
x86/hyper-v: Remove duplicated HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED definition
Commit-ID: 1278f58cdee63cfbb04e5624474a291c81a7a13b Gitweb: http://git.kernel.org/tip/1278f58cdee63cfbb04e5624474a291c81a7a13b Author: Vitaly Kuznetsov <[email protected]> AuthorDate: Mon, 11 Sep 2017 17:06:20 +0200 Committer: Ingo Molnar <[email protected]> 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 <[email protected]>
Cc Haiyang Zhang <[email protected]>
Cc K. Y. Srinivasan <[email protected]>
Cc Linus Torvalds <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephen Hemminger <[email protected]>
Cc Thomas Gleixner <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
--- arch/x86/include/uapi/asm/hyperv.h | 6 ------ 1 file changed, 6 deletions(-)
arch/x86/include/uapi/asm/hyperv.h +0 -6
@@ -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)