From patchwork Mon Oct 24 11:28:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9223 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp460777wru; Mon, 24 Oct 2022 06:42:26 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5g/Skiu9Cfcs7eb7zFwv9ZPZYyEJ1lQOOO3/jhdBXhPKqL2lfa3OOLk10iCdsiMqwuYRAA X-Received: by 2002:a17:90b:38cf:b0:212:d06c:9489 with SMTP id nn15-20020a17090b38cf00b00212d06c9489mr18997451pjb.220.1666618946424; Mon, 24 Oct 2022 06:42:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666618946; cv=none; d=google.com; s=arc-20160816; b=sHSLyKVuLClQ4B0u5g7H2FNd21Z53W8Qt69X4txIe4oOzgPBupQXswbR1rBp1yIqx6 O0uz3pK4tmm1Tklxv/34tiNAN4M1D2Q/HPkEbDtxEXxMTeiv1vj8ib6W99DR2/p0/PDR p1Jh0izVnKyZXqTu31ardKqx8cZT+VvsEetruzy0SYqVjC8exU8k4FitsnAfGF/+1t4L tTxDReYjeFrQRxmYudOSn5g8w+WfJ2lmnI2HrNpYsM4no+/OtamI92HJmDQEGZMH7uxH n5QYzK39UVI/F5y94xsEmH3E6FPS52X855JrMNqNT090GM8N3VuqJaIPjDopRBBHcmwP rpMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=rZJCw1BUaXAkPEVfPWVe0AY9et0Q0UzHfPhEg+LoXcU=; b=iZ410ZzVU7C8YaYFYaSMHbY508vdFAcugt60hSdzGbd+IGvTVRbJBIXVSHS+6LIqIV aDoTO8o0ME3lHXo53KDUrwzC90VC7K461K1hnrSnCSgneoxwCI1Xji8jup6iHTLebCeL esUlM70yBZXT8aTlXZ6UtAl/ibDJ35C0UFzqcguxmNI0WVbNFWjZEScWIl37RxbmLCQQ DIgYCWSaWNC/2ZsL0uXmtHieO/czNyL38HMDx2vhaKFMSm1YaToCku2H9yM3E+pd8tai zFTl5CcJRJeRnizaUViKIRkXvQZ1mzA/Vkd6wxLv/zqDPdnn2MYOS3Mds3A/Wrb7i3yn Vgsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=fbByqQbY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n1-20020a170902e54100b001786a4a4c98si37301199plf.371.2022.10.24.06.41.58; Mon, 24 Oct 2022 06:42:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=fbByqQbY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233678AbiJXNdp (ORCPT + 99 others); Mon, 24 Oct 2022 09:33:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42000 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236178AbiJXN34 (ORCPT ); Mon, 24 Oct 2022 09:29:56 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B136AC388; Mon, 24 Oct 2022 05:32:57 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D108861257; Mon, 24 Oct 2022 12:21:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E35F8C433D6; Mon, 24 Oct 2022 12:21:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666614074; bh=803LJiRW3lS0AHVQO2Hu2d5pYjBHKDxXq8Tbanxyns8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fbByqQbY8EQiFnfoj5eVw5LygYVFitGISxSsNNsW1zXTfVn+dI9sbw1zIbu59KvaM +CHfSfBzK3+Pm/+ANHlOewPokfcz6KAngnw5gFJz6mhrnKMS9LiZHiBf4XFoMvB+H7 LmWXuFjL+5ALmcJNc7c3rpJCl2Tr4fGSvfYOzjxg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?utf-8?q?Luciano_Le=C3=A3o?= , Borislav Petkov , " =?utf-8?q?N=C3=ADcolas_F_=2E__R_=2E__A_=2E_?= =?utf-8?q?_Prado?= " , Sasha Levin Subject: [PATCH 5.10 123/390] x86/cpu: Include the header of init_ia32_feat_ctl()s prototype Date: Mon, 24 Oct 2022 13:28:40 +0200 Message-Id: <20221024113027.909301165@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113022.510008560@linuxfoundation.org> References: <20221024113022.510008560@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747576628031261477?= X-GMAIL-MSGID: =?utf-8?q?1747576628031261477?= From: Luciano Leão [ Upstream commit 30ea703a38ef76ca119673cd8bdd05c6e068e2ac ] Include the header containing the prototype of init_ia32_feat_ctl(), solving the following warning: $ make W=1 arch/x86/kernel/cpu/feat_ctl.o arch/x86/kernel/cpu/feat_ctl.c:112:6: warning: no previous prototype for ‘init_ia32_feat_ctl’ [-Wmissing-prototypes] 112 | void init_ia32_feat_ctl(struct cpuinfo_x86 *c) This warning appeared after commit 5d5103595e9e5 ("x86/cpu: Reinitialize IA32_FEAT_CTL MSR on BSP during wakeup") had moved the function init_ia32_feat_ctl()'s prototype from arch/x86/kernel/cpu/cpu.h to arch/x86/include/asm/cpu.h. Note that, before the commit mentioned above, the header include "cpu.h" (arch/x86/kernel/cpu/cpu.h) was added by commit 0e79ad863df43 ("x86/cpu: Fix a -Wmissing-prototypes warning for init_ia32_feat_ctl()") solely to fix init_ia32_feat_ctl()'s missing prototype. So, the header include "cpu.h" is no longer necessary. [ bp: Massage commit message. ] Fixes: 5d5103595e9e5 ("x86/cpu: Reinitialize IA32_FEAT_CTL MSR on BSP during wakeup") Signed-off-by: Luciano Leão Signed-off-by: Borislav Petkov Reviewed-by: Nícolas F. R. A. Prado Link: https://lore.kernel.org/r/20220922200053.1357470-1-lucianorsleao@gmail.com Signed-off-by: Sasha Levin --- arch/x86/kernel/cpu/feat_ctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/feat_ctl.c b/arch/x86/kernel/cpu/feat_ctl.c index 29a3bedabd06..d7541851288e 100644 --- a/arch/x86/kernel/cpu/feat_ctl.c +++ b/arch/x86/kernel/cpu/feat_ctl.c @@ -1,11 +1,11 @@ // SPDX-License-Identifier: GPL-2.0 #include +#include #include #include #include #include -#include "cpu.h" #undef pr_fmt #define pr_fmt(fmt) "x86/cpu: " fmt