From patchwork Sat Oct 22 07:22:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 7362 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp1095718wrr; Sat, 22 Oct 2022 01:03:22 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4IXHYlffpn35f4zSs3zYG0Y6STOF0egkBnaN/ddLj1KOLPP4cdMtcoWXRZ2QS0u8fLsWyW X-Received: by 2002:a17:902:cccc:b0:178:a9b3:43e6 with SMTP id z12-20020a170902cccc00b00178a9b343e6mr22865226ple.92.1666425802055; Sat, 22 Oct 2022 01:03:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666425802; cv=none; d=google.com; s=arc-20160816; b=ynPisWGNNGju9gzZTiWwwB0GnfrioAkdAVemjjRBtwqEOz/wXm+TNm84T8Jqtnq+Pr phigaQCl0w5JpdD91Y8MDQMKlks3VexttHszdRw97cslkaqv+aYOUCDWw+QC/hxgX06/ GctSr4OQp80qa0L3Omvta68Z8gF8MQ1t5mQPus0BACh2C71pIi7/w+weftyWUgWKAr8G txhi/HqdHXK9q+tzj5l60XaiZ7hHeeKrDPb4lsIGyKhZMVB9DGeEqSF1x0ixSNyuVJAT cR3vDMDvwdRUFKZDGyJx8tXJvOQQ2NozeNncLNB5YMZ+WxI/wN9h8t24D6RyIBUm917j zULQ== 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=6vbu2UhrpqfSjY5KZbTC0xCcHezl4iro1za3qzWu2SE=; b=Mdbey1ZaeZfe/HSFdk/z9vpHyO6kcTO3drNK3qpmx3pWhkqrOWw3wiC5dkTTOC1dRm OWmAObN14DqPLFPDzkTXYfgROEqD5+KtSWBfq7G+syDUM9YaIbMvuXULHtHDykYX960h ufpqhogkUd9oLkOim9VatXKzHZhHISlvJKpYXXYA7l7wyU4eA042KIxa3yoFZtzb76UG Dt+dKgO+5sGq7Bc4g6z5IpldMPMsJs6nzROm8cwvcj0hPWNiGz5bKNl3dMcfxo6JzbuB HLfEbK0isVDzwJAzurLWfSA2jhCQ/wMAyrM5C/4kdp9M63+QQwgX0J5fwvlEFaLuEi21 wfBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=haBcRnvm; 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 189-20020a6306c6000000b0046ed84b9503si2092441pgg.77.2022.10.22.01.03.08; Sat, 22 Oct 2022 01:03:22 -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=haBcRnvm; 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 S232605AbiJVICs (ORCPT + 99 others); Sat, 22 Oct 2022 04:02:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232315AbiJVHyj (ORCPT ); Sat, 22 Oct 2022 03:54:39 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A52185F5D; Sat, 22 Oct 2022 00:47: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 ams.source.kernel.org (Postfix) with ESMTPS id B6CB1B82E18; Sat, 22 Oct 2022 07:47:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 10CCAC433C1; Sat, 22 Oct 2022 07:47:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666424835; bh=u5uu7zoc5mzz1n4mGIg5JGx6nhue3av2roUzPtmk3q8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=haBcRnvmn4UqHG+8ETH2JB/Vj3lhC87oHzw+qANufAC3GaxRB9OYPMHrOWeafFq7T gbJpis8me4fCImW3oll5pZ8t2ZCQdkUcMK3Io4T97kvFvb8lHYSclrnhGE/J7TD996 7rmc7NQXxDveK/+6GmS4koBWv1Z8G71iwFGunwUk= 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.19 264/717] x86/cpu: Include the header of init_ia32_feat_ctl()s prototype Date: Sat, 22 Oct 2022 09:22:23 +0200 Message-Id: <20221022072501.284632208@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221022072415.034382448@linuxfoundation.org> References: <20221022072415.034382448@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.3 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?1747374101491789821?= X-GMAIL-MSGID: =?utf-8?q?1747374101491789821?= 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 da696eb4821a..e77032c5f85c 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