Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp1826997imm; Mon, 3 Sep 2018 10:27:02 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZ+Z3pJhqeZkiMWedz/vcF7brZ4CcFZC8ZsZt+49nYnujwSdp/C48rk1UHJIuDLlflhtHP4 X-Received: by 2002:a63:4106:: with SMTP id o6-v6mr16041425pga.80.1535995622034; Mon, 03 Sep 2018 10:27:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535995622; cv=none; d=google.com; s=arc-20160816; b=yIZFACJ8QUlc/kEwmhNwES7XJAu91CmSKUVmkioaU7TZqC+3dhif+JxPxvPvInSL76 st6BkfqksQZZqbVJ1pCApT+EMWFvXYM6Zn/WYxtmszhmZsv3Qxut/0xYpXGh2S4DmtKM M+amgR0ngv2qfXixt4K4j/RZhVe5eqvpk7zWzMSGaOwRWwdbQu9EyMNfKAwGBGeakWIz dbPYIb1/uM0ooweeFn8jhtWrI8nvFuy7IWb0zYwfF1DVm7hk04MN2/RtYH/jBvUI+onI LjAbPsdK2rnF0YSGbi1J31RwB3iboxEuelhAuGENRsHq0lwxvEiaI6bSmg5Mx986CISY Mi+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=vUlrGu8iwQC0hOdpBECrevZs2oEd/Bc61SX+NjQsznM=; b=YZ0UPnE8zx6NEOfD8gvqQXOK3OOZq5Ay0GCu5HThh7X1eYM17UE0GsEE7/LeGPtGZs mOtUETbmP7Ht+X50flzsEOWy7sePrhzWXPCLpvhGa0CwCZVT+fB+4dA3KTIMcav94TXR s14Q0S+u57uIS4T+jRyq4dafuh+DEsJJY7TVi9nefGlmWXTdysiVzrNpIsBGxe15swDc B4REeQH3ABu1JzI/vH6ea3I4WPtNqWi+roIeCyEmoHt1kx6TW+e+VnaaPqKOOwPcjprv jQzFj9yU2+0xh5CZNdg2yEkC9m5NG69U0RFRZWcewbZAEyPf807nVeUFGrfIbhiMMFm9 m7PQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y63-v6si17690781pgd.435.2018.09.03.10.26.46; Mon, 03 Sep 2018 10:27:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730632AbeICVq0 (ORCPT + 99 others); Mon, 3 Sep 2018 17:46:26 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:45730 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728380AbeICVqZ (ORCPT ); Mon, 3 Sep 2018 17:46:25 -0400 Received: from localhost (ip-213-127-74-90.ip.prioritytelecom.net [213.127.74.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 4F442D3A; Mon, 3 Sep 2018 17:25:18 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Josh Poimboeuf , Thomas Gleixner , Paolo Bonzini Subject: [PATCH 4.14 117/165] x86/kvm/vmx: Remove duplicate l1d flush definitions Date: Mon, 3 Sep 2018 18:56:43 +0200 Message-Id: <20180903165701.407590746@linuxfoundation.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180903165655.003605184@linuxfoundation.org> References: <20180903165655.003605184@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Josh Poimboeuf commit 94d7a86c21a3d6046bf4616272313cb7d525075a upstream. These are already defined higher up in the file. Fixes: 7db92e165ac8 ("x86/kvm: Move l1tf setup function") Signed-off-by: Josh Poimboeuf Signed-off-by: Thomas Gleixner Cc: Paolo Bonzini Cc: stable@vger.kernel.org Link: https://lkml.kernel.org/r/d7ca03ae210d07173452aeed85ffe344301219a5.1534253536.git.jpoimboe@redhat.com Signed-off-by: Greg Kroah-Hartman --- arch/x86/kvm/vmx.c | 3 --- 1 file changed, 3 deletions(-) --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -9170,9 +9170,6 @@ static int vmx_handle_exit(struct kvm_vc * information but as all relevant affected CPUs have 32KiB L1D cache size * there is no point in doing so. */ -#define L1D_CACHE_ORDER 4 -static void *vmx_l1d_flush_pages; - static void vmx_l1d_flush(struct kvm_vcpu *vcpu) { int size = PAGE_SIZE << L1D_CACHE_ORDER;