Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2021774imu; Fri, 14 Dec 2018 04:38:38 -0800 (PST) X-Google-Smtp-Source: AFSGD/Wr9tdn7GYBAfReDvJsmKQScc1qQs84og+KqQNwQlSRM8L5XpV9h0ydtGI8Z8uzoBW1Lovk X-Received: by 2002:a63:101:: with SMTP id 1mr2600703pgb.152.1544791118833; Fri, 14 Dec 2018 04:38:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544791118; cv=none; d=google.com; s=arc-20160816; b=rCjjR6s5/KVK8zCiY6sTJbgRScCShWapK0mZvbmhzIqakj19o0m81WQQB9q5mxh+56 Q3FKwxtPI7JI8U0TvmKJrDAovX/yvhTi/W/KwxKF9xFOJMx+9c4oezrK5+hzSllt2X7R qUUYMG/Ag0hXjxOG7IvgugqiVev5Z6OqRnK3JqXsymbcM30mT0NLHZl3zOgGnEl3NKFz DsOawTpOhagMvgkGHWjKlyXRiknetHbdGrZ/jIj2wfhlWPCbRj/9vqbn8aU4stloHWls 3A3N8B9uPsJn+Dq9T6fvXgsdh7sN4ssbMCmDy2sPaTwcy7xKgbEdrO7VblEAp6W5lO5f tfOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=WkffP1dG6RtXluw6y/NDLFic9vp+qfGLMbGn+AuX/s4=; b=kqDnemW2p05rSTiaJKRicTpsFO3UxK18MlL8+W4qS8emE43rKPDPQQJ1/B+2Eca0ll 1gWxCpMjo9DVZd7fqWVZm8YpmhgdGrJ4XlKJfMK15p6XHmSXWlQYFeZY684VYn2UsfWw ERx0iwuozx2KcVzEmCLv4MJSpGmXFSUamsQpOVelJoZMkhN9X/F66c9tOmtALbc7kpFh aoxG5+owTUkA+YIkerwQrRmvy4TMM6O5Wn/lJZQ1llYzNmemeHACf+Kr1oA56RvwWGfV w2dS9v7fq1/4/Gf4nX1RWd1LO1UI++7NHvkiwkPos+soRNfgl+0EzU4tuGdQ0z7iKgrq wi1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=DZ9xsfQ1; 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 a17si4062514pfn.213.2018.12.14.04.38.24; Fri, 14 Dec 2018 04:38:38 -0800 (PST) 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; dkim=pass header.i=@kernel.org header.s=default header.b=DZ9xsfQ1; 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 S1730873AbeLNMGP (ORCPT + 99 others); Fri, 14 Dec 2018 07:06:15 -0500 Received: from mail.kernel.org ([198.145.29.99]:51178 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729832AbeLNMGM (ORCPT ); Fri, 14 Dec 2018 07:06:12 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 599E92147D; Fri, 14 Dec 2018 12:06:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544789171; bh=Rp81G6lI+bQ/fTlttJOIYDzpV3n5fV48NqwWTARdPsc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DZ9xsfQ13A7dowIDerJ2lavVA8k/8HM0b2XIqAOVE+JfxNEXmCwS1U5p4+elIhKHD /+gNz3lLSQ0Df1ZIFCk0sMxvWgxFv+9LQH8rRCVeg+OK3v1H6VyJCnjN11w2gaoLjZ kl1NJ8uX+MxpW3yIph2SNFjr7TBQBioRwRwlhLPk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yi Wang , Paolo Bonzini , Sasha Levin Subject: [PATCH 4.19 099/142] x86/kvm/vmx: fix old-style function declaration Date: Fri, 14 Dec 2018 12:59:44 +0100 Message-Id: <20181214115751.011454954@linuxfoundation.org> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20181214115747.053633987@linuxfoundation.org> References: <20181214115747.053633987@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 1e4329ee2c52692ea42cc677fb2133519718b34a ] The inline keyword which is not at the beginning of the function declaration may trigger the following build warnings, so let's fix it: arch/x86/kvm/vmx.c:1309:1: warning: ‘inline’ is not at beginning of declaration [-Wold-style-declaration] arch/x86/kvm/vmx.c:5947:1: warning: ‘inline’ is not at beginning of declaration [-Wold-style-declaration] arch/x86/kvm/vmx.c:5985:1: warning: ‘inline’ is not at beginning of declaration [-Wold-style-declaration] arch/x86/kvm/vmx.c:6023:1: warning: ‘inline’ is not at beginning of declaration [-Wold-style-declaration] Signed-off-by: Yi Wang Signed-off-by: Paolo Bonzini Signed-off-by: Sasha Levin --- arch/x86/kvm/vmx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index b1aef90aab91..c97a9d60d305 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -1285,7 +1285,7 @@ static void vmx_set_nmi_mask(struct kvm_vcpu *vcpu, bool masked); static bool nested_vmx_is_page_fault_vmexit(struct vmcs12 *vmcs12, u16 error_code); static void vmx_update_msr_bitmap(struct kvm_vcpu *vcpu); -static void __always_inline vmx_disable_intercept_for_msr(unsigned long *msr_bitmap, +static __always_inline void vmx_disable_intercept_for_msr(unsigned long *msr_bitmap, u32 msr, int type); static DEFINE_PER_CPU(struct vmcs *, vmxarea); @@ -5935,7 +5935,7 @@ static void free_vpid(int vpid) spin_unlock(&vmx_vpid_lock); } -static void __always_inline vmx_disable_intercept_for_msr(unsigned long *msr_bitmap, +static __always_inline void vmx_disable_intercept_for_msr(unsigned long *msr_bitmap, u32 msr, int type) { int f = sizeof(unsigned long); @@ -5973,7 +5973,7 @@ static void __always_inline vmx_disable_intercept_for_msr(unsigned long *msr_bit } } -static void __always_inline vmx_enable_intercept_for_msr(unsigned long *msr_bitmap, +static __always_inline void vmx_enable_intercept_for_msr(unsigned long *msr_bitmap, u32 msr, int type) { int f = sizeof(unsigned long); @@ -6011,7 +6011,7 @@ static void __always_inline vmx_enable_intercept_for_msr(unsigned long *msr_bitm } } -static void __always_inline vmx_set_intercept_for_msr(unsigned long *msr_bitmap, +static __always_inline void vmx_set_intercept_for_msr(unsigned long *msr_bitmap, u32 msr, int type, bool value) { if (value) -- 2.19.1