diff options
| author | Vitaly Kuznetsov <vkuznets@redhat.com> | 2017-09-11 11:06:20 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-09-13 05:29:46 -0400 |
| commit | 1278f58cdee63cfbb04e5624474a291c81a7a13b (patch) | |
| tree | b58a96d36fe6f4dce6b9af20bbbdf4dfd83cae98 | |
| parent | 213ff44ae4eb5224010166db2f851e4eea068268 (diff) | |
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 <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>
| -rw-r--r-- | arch/x86/include/uapi/asm/hyperv.h | 6 |
1 files changed, 0 insertions, 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 @@ | |||
| 153 | #define HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED (1 << 11) | 153 | #define HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED (1 << 11) |
| 154 | 154 | ||
| 155 | /* | 155 | /* |
| 156 | * HV_VP_SET available | ||
| 157 | */ | ||
| 158 | #define HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED (1 << 11) | ||
| 159 | |||
| 160 | |||
| 161 | /* | ||
| 162 | * Crash notification flag. | 156 | * Crash notification flag. |
| 163 | */ | 157 | */ |
| 164 | #define HV_CRASH_CTL_CRASH_NOTIFY (1ULL << 63) | 158 | #define HV_CRASH_CTL_CRASH_NOTIFY (1ULL << 63) |