aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Dakinevich <jan.dakinevich@gmail.com>2016-12-22 17:13:53 -0500
committerRadim Krčmář <rkrcmar@redhat.com>2017-01-05 09:08:48 -0500
commit69130ea1e6b9167d2459e2bab521196d0a0c0e68 (patch)
treeb7d19230137716bbbc317aa83bc8a02cddc80564
parent32eb12a6c11034867401d56b012e3c15d5f8141e (diff)
KVM: VMX: remove duplicated declaration
Declaration of VMX_VPID_EXTENT_SUPPORTED_MASK occures twice in the code. Probably, it was happened after unsuccessful merge. Signed-off-by: Jan Dakinevich <jan.dakinevich@gmail.com> Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
-rw-r--r--arch/x86/kvm/vmx.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index ba20b00a450f..a236decb81e4 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -132,12 +132,6 @@ module_param_named(preemption_timer, enable_preemption_timer, bool, S_IRUGO);
132 132
133#define VMX_MISC_EMULATED_PREEMPTION_TIMER_RATE 5 133#define VMX_MISC_EMULATED_PREEMPTION_TIMER_RATE 5
134 134
135#define VMX_VPID_EXTENT_SUPPORTED_MASK \
136 (VMX_VPID_EXTENT_INDIVIDUAL_ADDR_BIT | \
137 VMX_VPID_EXTENT_SINGLE_CONTEXT_BIT | \
138 VMX_VPID_EXTENT_GLOBAL_CONTEXT_BIT | \
139 VMX_VPID_EXTENT_SINGLE_NON_GLOBAL_BIT)
140
141/* 135/*
142 * Hyper-V requires all of these, so mark them as supported even though 136 * Hyper-V requires all of these, so mark them as supported even though
143 * they are just treated the same as all-context. 137 * they are just treated the same as all-context.