From patchwork Fri Jun 16 09:24:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 108977 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1197125vqr; Fri, 16 Jun 2023 02:30:08 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4ZpCuFknJESfIwEI5ETZV83M3tp3qJjVAKiGD+Mh0XET3PmTp48LPqPW/KGToVuz407l3r X-Received: by 2002:a17:90a:1cb:b0:25e:a5b2:846d with SMTP id 11-20020a17090a01cb00b0025ea5b2846dmr959638pjd.27.1686907808169; Fri, 16 Jun 2023 02:30:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686907808; cv=none; d=google.com; s=arc-20160816; b=NQqrt+TFwyngRW4UQHyz6BA67msnhsMJz54aHuWfXHvNQpFyJoiUECweEG6M5CW4Le w05ENTX+BBbUaQOG+MtWtQz6GduQMXtg8iiYslfnMPziZ2ebZOaAf23zZ4XEgWy3+mdv +q+Evfc4DsZ48cxsepxv7/q5J4xDKa2fscRnopXqE1/ee1A6BkPLZ231vvrV5d/z7abi 4J9fbC+EOa4UlltSabivcCrMfOu9ofBI4o9y/xSGm7IQaJlC7wDZ+7gCgri8eDKZnB/u /165qlcbtT6u0orHYNm/yjyD9F3cRV/KImC2C9ccJXLCH7QnpdxNgv+ZUq9zw9frd5ML pDwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=fxx0RCeiy6dviDtKxpkuqCnwNAMerbl/5Xrn8t4hSfI=; b=u7cWmmnzpxBj4R+qc0QlALVMs41Mpv7t22cFlx7JkJauDYXN5g/GK8KODztiTyNgET BoM6AtNi2LQr/m/ygs9rlNBYTneMJTA5kFPh5t38bmHoEZCCPtmIpDVA6BtiqFdlcX55 DEVztk0rJWclFX1/Q3WND8KChUpHvclmEmiGFoj0i+BFn1CGxBRWphdo1TbMw+r1mzOH a9srXhCvSlTRx/KO7NEJfgzBeSt27mFF6dxXnxyWhty4EIgUC+cM9V14i5ykUp4GWRXt Qtp3FqHcZIU6mt1Xb2jviZqaEtSxmW5QMuVRblNuKwhM1RLf5EFd9HJTg7imZLUNTMCv /VOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=Vbosa4fE; dkim=neutral (no key) header.i=@linutronix.de header.b=MBq6okTP; 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=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q9-20020a17090ad38900b0025998ebdc4csi1211082pju.60.2023.06.16.02.29.53; Fri, 16 Jun 2023 02:30:08 -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=@linutronix.de header.s=2020 header.b=Vbosa4fE; dkim=neutral (no key) header.i=@linutronix.de header.b=MBq6okTP; 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=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245688AbjFPJZ2 (ORCPT + 99 others); Fri, 16 Jun 2023 05:25:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344013AbjFPJYu (ORCPT ); Fri, 16 Jun 2023 05:24:50 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 52F16270B; Fri, 16 Jun 2023 02:24:44 -0700 (PDT) Date: Fri, 16 Jun 2023 09:24:42 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1686907483; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fxx0RCeiy6dviDtKxpkuqCnwNAMerbl/5Xrn8t4hSfI=; b=Vbosa4fEQnUQoxrubEOMLme/iPI/p1ltj8yIK6I4ultZOLQ6ABdijFuJss6c9RgrstkxoJ ODITBOWT/FAfwnwUxZniKVcAZDsXjIUJ9vr1GaSpxZ0D+wil3p1p+59L6tMbdrO6L+htX3 ivHu9FlOnfl7t/NOaboDGFr+B5ciNmgFc1HIxuBVzZ2uTnvIYOzb5E53Kn9IyteSoXpka1 f5zSTKjqe5aoQ7sYo2PvmXYCIbHeTxKGbflbsyTR+WfP/7nTrWyDUrQjotM8ExekMZ/Ls3 IGG9sdGe1kOl0riBYXlJR6bfsHlah2JgNR0yI2Rm8kixTtiXDqjlMZh4OsPMeA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1686907483; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fxx0RCeiy6dviDtKxpkuqCnwNAMerbl/5Xrn8t4hSfI=; b=MBq6okTPzj+u2vszI0WRZs2fpVOjpW8kWNHUzMWExTAb2LtckRqEcMrnwN48nVYjs5/WMz E4DxQmcEF4bdGJDA== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/boot] x86/fpu: Remove cpuinfo argument from init functions Cc: Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230613224545.783704297@linutronix.de> References: <20230613224545.783704297@linutronix.de> MIME-Version: 1.0 Message-ID: <168690748250.404.15732608028451702185.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1768632879314582219?= X-GMAIL-MSGID: =?utf-8?q?1768851041527672768?= The following commit has been merged into the x86/boot branch of tip: Commit-ID: 1f34bb2a24643e0087652d81078e4f616562738d Gitweb: https://git.kernel.org/tip/1f34bb2a24643e0087652d81078e4f616562738d Author: Thomas Gleixner AuthorDate: Wed, 14 Jun 2023 01:39:43 +02:00 Committer: Thomas Gleixner CommitterDate: Fri, 16 Jun 2023 10:16:01 +02:00 x86/fpu: Remove cpuinfo argument from init functions Nothing in the call chain requires it Signed-off-by: Thomas Gleixner Link: https://lore.kernel.org/r/20230613224545.783704297@linutronix.de --- arch/x86/include/asm/fpu/api.h | 2 +- arch/x86/kernel/cpu/common.c | 2 +- arch/x86/kernel/fpu/init.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/x86/include/asm/fpu/api.h b/arch/x86/include/asm/fpu/api.h index 503a577..b475d9a 100644 --- a/arch/x86/include/asm/fpu/api.h +++ b/arch/x86/include/asm/fpu/api.h @@ -109,7 +109,7 @@ extern void fpu_reset_from_exception_fixup(void); /* Boot, hotplug and resume */ extern void fpu__init_cpu(void); -extern void fpu__init_system(struct cpuinfo_x86 *c); +extern void fpu__init_system(void); extern void fpu__init_check_bugs(void); extern void fpu__resume_cpu(void); diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index b8a4db1..2807e5b 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -1604,7 +1604,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c) sld_setup(c); - fpu__init_system(c); + fpu__init_system(); #ifdef CONFIG_X86_32 /* diff --git a/arch/x86/kernel/fpu/init.c b/arch/x86/kernel/fpu/init.c index 851eb13..5001df9 100644 --- a/arch/x86/kernel/fpu/init.c +++ b/arch/x86/kernel/fpu/init.c @@ -71,7 +71,7 @@ static bool fpu__probe_without_cpuid(void) return fsw == 0 && (fcw & 0x103f) == 0x003f; } -static void fpu__init_system_early_generic(struct cpuinfo_x86 *c) +static void fpu__init_system_early_generic(void) { if (!boot_cpu_has(X86_FEATURE_CPUID) && !test_bit(X86_FEATURE_FPU, (unsigned long *)cpu_caps_cleared)) { @@ -211,10 +211,10 @@ static void __init fpu__init_system_xstate_size_legacy(void) * Called on the boot CPU once per system bootup, to set up the initial * FPU state that is later cloned into all processes: */ -void __init fpu__init_system(struct cpuinfo_x86 *c) +void __init fpu__init_system(void) { fpstate_reset(¤t->thread.fpu); - fpu__init_system_early_generic(c); + fpu__init_system_early_generic(); /* * The FPU has to be operational for some of the