From patchwork Tue Feb 27 09:17:30 2024 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: 207102 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp2580635dyb; Tue, 27 Feb 2024 01:18:13 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUWwZeL/S0zntGFI3GFRYJUzFJbyL2HbM20JrAWK2NKzwJBogkSewxUuBxwrulookvqdff6u+VxsPjR2Hzyhi4yP5aMQw== X-Google-Smtp-Source: AGHT+IFE5o3eOeMVgYRgmnbDekqPzfmRgKzEWv8MIWtMR2Q3o+gggsKOh5L12QxV2B7UYvKJq4zM X-Received: by 2002:a05:622a:594:b0:42e:7e22:52c4 with SMTP id c20-20020a05622a059400b0042e7e2252c4mr6215516qtb.52.1709025493047; Tue, 27 Feb 2024 01:18:13 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709025493; cv=pass; d=google.com; s=arc-20160816; b=DXfebb6aIs6zpr7TLOCYcIpi7Y59JSGXrHw1k7MZTuYmBG3EDO0jlq0Y+N6kgg2DPc ihCMyRZlNTObXuebm2tm8jhF2SDD8ugjxwmO3Zrv0Dg00smmKIAMOWajyzk9OoEVnUU/ H75+oSDHubLDhpR826vhOUJzooakkfHxfW4Xsj/vPRId1rS02ax1G75WqgB35Q+jYeSc ol+yphZXaXuLJjO38bifAzXU+gl/6GCl+fst1bFu4US90iajrEYrrrp3zQkE0il65Oyk Cuig/2tqqOk5lAZFi+pP2r03Jfo2IRC/5+Q/Qd8DB9wjrSnz7TyOHDwY0D5w32cZ7Li/ 4dtA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:precedence:robot-unsubscribe:robot-id :message-id:mime-version:list-unsubscribe:list-subscribe:list-id :precedence:cc:subject:to:reply-to:sender:from:dkim-signature :dkim-signature:date; bh=RYjjGm4NuN6OSTvJGHuae1Wfp0CLCSRTyqh1PX+D7kU=; fh=UwftEdEwtg14ADOO3ZWAylrUQ27A8X0kqeA8E50kBPU=; b=DyYsCI2BX2yeAOjT60LMinWesuVJmOVPB8DeFoA1IQl2ccoLDeHKZLHKGdEQISY460 E43xmnUFLg0miHVJIoWLrtHVtya+vjrsXVBvcZoipcuEOoEy7BcqaI2a8ASq/zT5jkuJ CUDOhIVHmOZg7PLpKCcrR5iapmmTZyiTFCg+yC/4Zyug3Tw9uhdTtYtBQJbyKQqprmvS T5uBYsgO28Hj56CgV04e9wbZIdLjir3CgMovIAN1X2bTc7xj6e2TqabLTGZhvmQeO/1D paWvFpW/3uAtLvfRYdyaRdgMVCw6znBSMnDhVOhwv57psfJxBNP9m2e0gG7Z2dFxplj+ VV+Q==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=hxoKMq2w; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-82940-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-82940-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id r7-20020ac85207000000b0042e1260d4efsi6890954qtn.521.2024.02.27.01.18.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Feb 2024 01:18:13 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-82940-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=hxoKMq2w; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-82940-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-82940-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id C093F1C20929 for ; Tue, 27 Feb 2024 09:18:12 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B683D1369A5; Tue, 27 Feb 2024 09:17:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="hxoKMq2w"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="YQB4VY+T" Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2553C135A6E; Tue, 27 Feb 2024 09:17:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709025458; cv=none; b=VeJCxno0KcQ/xJ3PoazQK/HqbI7iHqfyCqTiqt4BCqDGqMVp8yefeJWnh5Fgb/tuy6udDO21thvDlgGqBakYtHMQsC8weiF8MEo8IwJTWrFQYDDAA7Jw7/PLdnoAfMYbNIQab5ePMlK27EY8SxKoohgKZvFV4IbSS0yCCpuWXZo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709025458; c=relaxed/simple; bh=OSdWc1vJMxiU3gVFNe8kfWPCENt6njYSFBj2jIbWgrw=; h=Date:From:To:Subject:Cc:MIME-Version:Message-ID:Content-Type; b=iWpvvpE8Wof4jVaObhO23ane+Kb5cnHfOHHEH32T4x0LJV92GHFFkDbytHpESqbrPBfD4pQBXoES3z80mWWfoGkJJ25PEqrwZu8nslEogK6P9QzZnjT7cO6pOdltAOcWJi5F1LG7yVcgac5YpPQM1ksNDZSHVuMh2mGNzwI3zr8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=hxoKMq2w; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=YQB4VY+T; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Date: Tue, 27 Feb 2024 09:17:30 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1709025451; 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; bh=RYjjGm4NuN6OSTvJGHuae1Wfp0CLCSRTyqh1PX+D7kU=; b=hxoKMq2w9lDKy1XjGXbi1lF6dAL3MpPihSCOGjwhrUaewZ37pxQmcQ9pqTG3ACYGjdsz85 Sl6shN2oK4nCSYBp/oJsCza4K8ipoUy9r9OjW2+G6Bq++GMg5WOCx3Qdg7NlZX1R4Pd5FI l8D8jK2vJ8wUz4nsKDupNE+CdRZBJ3XyTNnxnGOetcWJr7l6JiXq3tnICdb40FpwOCt10F ON7XCXO7HKfXV69+Y0gy7xQ/hZWs74nNzyyc56CZPxHzqgX38q+aKQxvlR+mkIkcN9zcqF 4vIxJfVLn+5RatEHlrGnxQyy3tDxgwJU8xt91vOXujUN//2kvQalumkSv1iJSA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1709025451; 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; bh=RYjjGm4NuN6OSTvJGHuae1Wfp0CLCSRTyqh1PX+D7kU=; b=YQB4VY+TJmFZpOFAZMUyIu5bpqHVnPDJPmB+3nng/68+Bdkkd9g1H2174RumVg5G0UBc26 1AY00++BV0r92uBQ== From: "tip-bot2 for Ingo Molnar" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/apic] smp: Provide 'setup_max_cpus' definition on UP too Cc: Thomas Gleixner , linux-kernel@vger.kernel.org, Ingo Molnar , x86@kernel.org Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <170902545035.398.17991702493246813954.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792043115798201909 X-GMAIL-MSGID: 1792043115798201909 The following commit has been merged into the x86/apic branch of tip: Commit-ID: 3c2f8859ae1ce53f2a89c8e4ca4092101afbff67 Gitweb: https://git.kernel.org/tip/3c2f8859ae1ce53f2a89c8e4ca4092101afbff67 Author: Ingo Molnar AuthorDate: Mon, 26 Feb 2024 12:07:31 +01:00 Committer: Ingo Molnar CommitterDate: Tue, 27 Feb 2024 10:05:41 +01:00 smp: Provide 'setup_max_cpus' definition on UP too This was already defined locally by init/main.c, but let's make it generic, as arch/x86/kernel/cpu/topology.c is going to make use of it to have more uniform code. Reviewed-by: Thomas Gleixner Cc: linux-kernel@vger.kernel.org Signed-off-by: Ingo Molnar --- include/linux/smp.h | 2 ++ init/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/linux/smp.h b/include/linux/smp.h index e87520d..7a83fd2 100644 --- a/include/linux/smp.h +++ b/include/linux/smp.h @@ -218,6 +218,8 @@ smp_call_function_any(const struct cpumask *mask, smp_call_func_t func, static inline void kick_all_cpus_sync(void) { } static inline void wake_up_all_idle_cpus(void) { } +#define setup_max_cpus 0 + #ifdef CONFIG_UP_LATE_INIT extern void __init up_late_init(void); static inline void smp_init(void) { up_late_init(); } diff --git a/init/main.c b/init/main.c index e24b078..5644bb1 100644 --- a/init/main.c +++ b/init/main.c @@ -603,7 +603,6 @@ static int __init rdinit_setup(char *str) __setup("rdinit=", rdinit_setup); #ifndef CONFIG_SMP -static const unsigned int setup_max_cpus = NR_CPUS; static inline void setup_nr_cpu_ids(void) { } static inline void smp_prepare_cpus(unsigned int maxcpus) { } #endif