Re: [PATCH] KVM: VMX: remove duplicated declaration

["Radim Krčmář" <rkrcmar@redhat.com>]

2016-12-23 01:13+0300, Jan Dakinevich:
> Declaration of VMX_VPID_EXTENT_SUPPORTED_MASK occures twice in the code.
> Probably, it was happened after unsuccessful merge.

Hm, looks even weirder: the deleted hunk was added by bcdde302b826
("KVM: nVMX: invvpid handling improvements") and then 16c2aec6a295
("KVM: nVMX: invvpid handling improvements") duplicated the define and
added the comment on top of it.

> Signed-off-by: Jan Dakinevich <jan.dakinevich@gmail.com>
> ---

Applied to kvm/master, thanks.

>  arch/x86/kvm/vmx.c | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> index 24db5fb..8c4e9ea 100644
> --- a/arch/x86/kvm/vmx.c
> +++ b/arch/x86/kvm/vmx.c
> @@ -132,12 +132,6 @@
>  
>  #define VMX_MISC_EMULATED_PREEMPTION_TIMER_RATE 5
>  
> -#define VMX_VPID_EXTENT_SUPPORTED_MASK		\
> -	(VMX_VPID_EXTENT_INDIVIDUAL_ADDR_BIT |	\
> -	VMX_VPID_EXTENT_SINGLE_CONTEXT_BIT |	\
> -	VMX_VPID_EXTENT_GLOBAL_CONTEXT_BIT |	\
> -	VMX_VPID_EXTENT_SINGLE_NON_GLOBAL_BIT)
> -
>  /*
>   * Hyper-V requires all of these, so mark them as supported even though
>   * they are just treated the same as all-context.
> -- 
> 1.9.1
>