From mboxrd@z Thu Jan 1 00:00:00 1970 From: Radim =?utf-8?B?S3LEjW3DocWZ?= Subject: Re: [PATCH] KVM: VMX: remove duplicated declaration Date: Thu, 5 Jan 2017 18:19:10 +0100 Message-ID: <20170105171909.GC29430@potion> References: <1482444833-32183-1-git-send-email-jan.dakinevich@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: kvm@vger.kernel.org, Paolo Bonzini To: Jan Dakinevich Return-path: Received: from mx1.redhat.com ([209.132.183.28]:41050 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935205AbdAERTN (ORCPT ); Thu, 5 Jan 2017 12:19:13 -0500 Content-Disposition: inline In-Reply-To: <1482444833-32183-1-git-send-email-jan.dakinevich@gmail.com> Sender: kvm-owner@vger.kernel.org List-ID: 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 > --- 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 >