From patchwork Thu Dec 22 22:13:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Dakinevich X-Patchwork-Id: 9486917 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7F0BC62AAA for ; Thu, 22 Dec 2016 22:14:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 707A927F99 for ; Thu, 22 Dec 2016 22:14:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 62A822842B; Thu, 22 Dec 2016 22:14:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 072B127F99 for ; Thu, 22 Dec 2016 22:14:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758646AbcLVWO4 (ORCPT ); Thu, 22 Dec 2016 17:14:56 -0500 Received: from mail-lf0-f66.google.com ([209.85.215.66]:33951 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750919AbcLVWOz (ORCPT ); Thu, 22 Dec 2016 17:14:55 -0500 Received: by mail-lf0-f66.google.com with SMTP id d16so5565722lfb.1 for ; Thu, 22 Dec 2016 14:14:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=KFu4kssRM/k4N1a3VF5cr1E2PlCd4IE2Kg3CU/HNLTE=; b=Vbh5zKjsEWhbEkvSz+W2xjvmdxFNnMl2DRFs9gTSw92x4LdNeWeRyT2wV2kB7NGA30 oIOrW3SxP9hwmeD5gRFtYqeLYrm5mH34/73Yz2I24+OCHj9kteQMkUf0GGWzrN7vZAKL hLdqj/nNVYRsDtTiDCwdQpi6PEg/jvrltaLI5KK+dkWju93a2ptOXk7CWkyjoOBSPROQ cccepR7+b5gMzjDlrjWALYWjMRk1zhog4bx2jdUkg9us7tZtJBUx6npg7U9ixKJYa0iB LKvKAUcT/n6xBTl6RkqYkvA47uJQRD7h8oy1HdT2oIH3MLKqKc1OTIl3/mMuJfz5izLr r5GA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=KFu4kssRM/k4N1a3VF5cr1E2PlCd4IE2Kg3CU/HNLTE=; b=Y53G+G6vhQBuBs2tU5znqI0+Tm7PMgFv2dOyYfpy0vESV4f7R6zI5cr4Vs7SwK7ygW Nc8h08w4A07cnbGBLpWR2CLSqbQBXytCC/5pW7bPbDrBoVeHSDATQ2QhJrpe+l4L7Bm6 6qa3v4+JnmI/RM2uleAvz/Jo/q2l6K9G2EAuPXDXllOEcvz//rlPTSV0GN3TbPUGL32j DEzF8Pd0sU+4yDEMsoFzcLnWGkcB0TsI/cSo7L76yC5DW/UzLtjpcYoSVgZhZ8tqRXdD HcmFNfR3jY3cBBkpFJ0WFU7cFtpvWtCPdSISTKIpEoJ8qDV4c1f9kpkzncF5WTn1V+2c 6uFA== X-Gm-Message-State: AIkVDXInWKeTlXXfYhTotFnm6hf+XyswFJXbhQzxON6MX66XlM6EgDRkGqF7YdQqKoouwA== X-Received: by 10.25.99.73 with SMTP id x70mr4714891lfb.81.1482444893679; Thu, 22 Dec 2016 14:14:53 -0800 (PST) Received: from localhost.localdomain (194-28-30-174.static-pppoe.itce.ru. [194.28.30.174]) by smtp.gmail.com with ESMTPSA id y26sm7339333lja.22.2016.12.22.14.14.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 22 Dec 2016 14:14:53 -0800 (PST) From: Jan Dakinevich To: kvm@vger.kernel.org Cc: Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , Jan Dakinevich Subject: [PATCH] KVM: VMX: remove duplicated declaration Date: Fri, 23 Dec 2016 01:13:53 +0300 Message-Id: <1482444833-32183-1-git-send-email-jan.dakinevich@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Declaration of VMX_VPID_EXTENT_SUPPORTED_MASK occures twice in the code. Probably, it was happened after unsuccessful merge. Signed-off-by: Jan Dakinevich --- 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.