From patchwork Tue May 16 09:10:03 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: 94574 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp285436vqo; Tue, 16 May 2023 02:15:18 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4thoci1oez/o6l67sjNc+up6PHVjbZUS/S6gNNAJpqybj9RKFAeGOcooFRHH+ufu7DTqg7 X-Received: by 2002:a05:6a20:1451:b0:105:f8e4:7214 with SMTP id a17-20020a056a20145100b00105f8e47214mr8717050pzi.42.1684228518115; Tue, 16 May 2023 02:15:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684228518; cv=none; d=google.com; s=arc-20160816; b=S+LDqGGD8RTbi59ig7GBBkTUSErpAxXXg3oftIkzJUTwPm5F5AT33mJw6D31QxUl0a IJMcXztJkXQZsvt/d5GfXAbl5o6YItkAgH0/VvgRbV27fZHyg8If07PtfASHJRC3pB5L 1f5cnMDMNVkcIKvaLHYAP5HFfPXWtnAQdwXBCx8QhHf2XQsFfTOrKDuRT1h/tkE5LYGv g1oO2Kd1O5aKdhQJp5bdlQfQ0LuoxB8VaXTJYq6uLeBZ67hQEixl8zzoYCqSZSPjNy24 r1byEBwJjp7thI0ndVkDLRh8S+kqGaSHMskmI9dda8zUuOzvVanNAtZfCawo6kouu415 6XKA== 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=LAw3iiNKYMs7YXhTK+oHrE7mTiSbiNakd4j8jRewZtA=; b=Z4bGeZ0wYnCjQgWQS2cRTDbDHxubxwtAvcw9+Ic432NJvXXJMCdDiR9v3vz6PIDzId ONhKpKBhIBJOvekrF0oSIY0wcBvRRoY4hznqliqxilvl9nkFgtP71AblN3rRYzXnTKHb Gdbfm/t0u19k4HJwJQIxCSR1Ev7srMn8wS0uvLNXi94MRBDLfS8IuOEe50mxyp+vAT0M qSFZyBzfgjOFzjbBbhdNiD5zmIMElNblFtmmGnmI/XRZpaajMTGkEQvWlkB2+n0xeYZn wtJqPORs2L0dl//GIXxmpdhzkHqCA7E7+cfKJKgLODfA6xgpf6x8mI+FULlNRif14Lzl /oJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=32LCS+h2; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=jDjJae2E; 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 c18-20020a637252000000b0050beec91e30si17197490pgn.768.2023.05.16.02.15.03; Tue, 16 May 2023 02:15:18 -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=32LCS+h2; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=jDjJae2E; 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 S231861AbjEPJMb (ORCPT + 99 others); Tue, 16 May 2023 05:12:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46074 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231853AbjEPJKP (ORCPT ); Tue, 16 May 2023 05:10:15 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A09F49EC; Tue, 16 May 2023 02:10:07 -0700 (PDT) Date: Tue, 16 May 2023 09:10:03 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1684228203; 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=LAw3iiNKYMs7YXhTK+oHrE7mTiSbiNakd4j8jRewZtA=; b=32LCS+h2JVoJNIHOcky7ZlnkRrwsiTdyswJ/rQMPDnBIzJuhTb3dw6xFCmeUnFkqLS62GB lRGHEPGXKbZmehL0eETY20GjJiY3sZVddUlVxHzJZTGAUM1NKeB9LRnzX2dzeLezLNqYq6 KJNu527IMwx115QD9tN/Pa+4mu7AoMvZcmhMrZEiPZuZiqz9K9QbS5gHCzPw6ntvgG1IQX sb0e0H3YGnEj5t0lo4qH0NWK/Q6m2JWo4yJp3Vn5GescngoBwBf1a6xep7V1dId0vdm+Fq MoETgxvzwDbxr71dVEInUxQhv0Ct8z+/SRgdd/FxUXzgxFPE8a/I45qiVn5AJQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1684228203; 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=LAw3iiNKYMs7YXhTK+oHrE7mTiSbiNakd4j8jRewZtA=; b=jDjJae2Es86p8L53Ur6hqTJmlBJkhXDtEm8dDHMonrDZK2UlJhKWul3VcE8UKt9+oCIEam W/ys6aly2Cr8bUAA== 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: smp/core] cpu/hotplug: Mark arch_disable_smp_support() and bringup_nonboot_cpus() __init Cc: Thomas Gleixner , "Peter Zijlstra (Intel)" , Michael Kelley , Oleksandr Natalenko , Helge Deller , "Guilherme G. Piccoli" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230512205255.551974164@linutronix.de> References: <20230512205255.551974164@linutronix.de> MIME-Version: 1.0 Message-ID: <168422820351.404.11737048171121591047.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?1765724717813359488?= X-GMAIL-MSGID: =?utf-8?q?1766041602872167845?= The following commit has been merged into the smp/core branch of tip: Commit-ID: ba831b7b1a517ba7f25d6fa9736a8092d07b0c74 Gitweb: https://git.kernel.org/tip/ba831b7b1a517ba7f25d6fa9736a8092d07b0c74 Author: Thomas Gleixner AuthorDate: Fri, 12 May 2023 23:07:00 +02:00 Committer: Peter Zijlstra CommitterDate: Mon, 15 May 2023 13:44:47 +02:00 cpu/hotplug: Mark arch_disable_smp_support() and bringup_nonboot_cpus() __init No point in keeping them around. Signed-off-by: Thomas Gleixner Signed-off-by: Peter Zijlstra (Intel) Tested-by: Michael Kelley Tested-by: Oleksandr Natalenko Tested-by: Helge Deller # parisc Tested-by: Guilherme G. Piccoli # Steam Deck Link: https://lore.kernel.org/r/20230512205255.551974164@linutronix.de --- arch/x86/kernel/smpboot.c | 4 ++-- kernel/cpu.c | 2 +- kernel/smp.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index bca9692..8eb7721 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -1269,9 +1269,9 @@ unreg_nmi: } /** - * arch_disable_smp_support() - disables SMP support for x86 at runtime + * arch_disable_smp_support() - Disables SMP support for x86 at boottime */ -void arch_disable_smp_support(void) +void __init arch_disable_smp_support(void) { disable_ioapic_support(); } diff --git a/kernel/cpu.c b/kernel/cpu.c index f4a2c58..c0d859c 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -1502,7 +1502,7 @@ int bringup_hibernate_cpu(unsigned int sleep_cpu) return 0; } -void bringup_nonboot_cpus(unsigned int setup_max_cpus) +void __init bringup_nonboot_cpus(unsigned int setup_max_cpus) { unsigned int cpu; diff --git a/kernel/smp.c b/kernel/smp.c index ab3e5da..71dce74 100644 --- a/kernel/smp.c +++ b/kernel/smp.c @@ -892,7 +892,7 @@ EXPORT_SYMBOL(setup_max_cpus); * SMP mode to . */ -void __weak arch_disable_smp_support(void) { } +void __weak __init arch_disable_smp_support(void) { } static int __init nosmp(char *str) {