* [PATCH] x86/hyper-v: Remove doubled HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED definition
@ 2017-09-11 15:06 Vitaly Kuznetsov
2017-09-13 10:07 ` [tip:x86/urgent] x86/hyper-v: Remove duplicated " tip-bot for Vitaly Kuznetsov
0 siblings, 1 reply; 2+ messages in thread
From: Vitaly Kuznetsov @ 2017-09-11 15:06 UTC (permalink / raw)
To: x86
Cc: K. Y. Srinivasan, Haiyang Zhang, Stephen Hemminger,
Thomas Gleixner, Ingo Molnar, H. Peter Anvin, devel,
linux-kernel
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* [tip:x86/urgent] x86/hyper-v: Remove duplicated HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED definition
2017-09-11 15:06 [PATCH] x86/hyper-v: Remove doubled HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED definition Vitaly Kuznetsov
@ 2017-09-13 10:07 ` tip-bot for Vitaly Kuznetsov
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Vitaly Kuznetsov @ 2017-09-13 10:07 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, vkuznets, haiyangz, torvalds, kys, sthemmin, hpa,
peterz, tglx, mingo
Commit-ID: 1278f58cdee63cfbb04e5624474a291c81a7a13b
Gitweb: http://git.kernel.org/tip/1278f58cdee63cfbb04e5624474a291c81a7a13b
Author: Vitaly Kuznetsov <vkuznets@redhat.com>
AuthorDate: Mon, 11 Sep 2017 17:06:20 +0200
Committer: Ingo Molnar <mingo@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 <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>
---
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)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-09-13 10:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-11 15:06 [PATCH] x86/hyper-v: Remove doubled HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED definition Vitaly Kuznetsov
2017-09-13 10:07 ` [tip:x86/urgent] x86/hyper-v: Remove duplicated " tip-bot for Vitaly Kuznetsov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome