From patchwork Mon Feb 26 11:48:05 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: 206590 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp2015463dyb; Mon, 26 Feb 2024 03:48:27 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCW7SlsIXTXMrppiwaAEwrjRiLbHYQCSh3G+uxvNT5LWl9d/4zrBS9g0qDI15Nwr2BIEW7DdzjzXpUn90X50xXdcAnCrMw== X-Google-Smtp-Source: AGHT+IF2WmPnbk+WR4ZbJ8NJjluFCAoAhHscv/jmxIe6Zm9ozpwUsq5maiZeboaEwcB8EFUarnWB X-Received: by 2002:a05:6358:98a0:b0:17b:87b6:b56 with SMTP id q32-20020a05635898a000b0017b87b60b56mr10067496rwa.19.1708948107582; Mon, 26 Feb 2024 03:48:27 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708948107; cv=pass; d=google.com; s=arc-20160816; b=IqSdpcpkNDiJGo/5dGnyrEzEMSsAlqcN0Ozyl/XNd4a8185wFaMlGwW3Wu2TB+ejTk RQDqjV/YtF702KUsoULD040ayEDATc+zegPv27CD1N2k/5ScAh9o8VrwAvc4PBJotQRE Of72f/0H8x9K8ny4GWS8qo8gAZCmaKYHaMzWqK9QPNRLaycsRq8MKEb+KfatdNoaSu4V gxFz4O1qBBmWceRrRdOxgIqykpWn5g2kXjOuYsd5y/RfilvvYRLp8n64yclm5Kyo9kxP RaUlBp0RUxMeNWs7LAe0icALOI5Loz9bX6JghBoNPbdn/iCL9FNDRCRgm+uRzSRYyykp T5xA== 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=gtCLZIY7ypiDdoCqSBLWsntMRCB2Ts4tl7NPSt9FmyM=; fh=UwftEdEwtg14ADOO3ZWAylrUQ27A8X0kqeA8E50kBPU=; b=xdwbjHZBTYETmw9vp75ezWzP44W7QMi7NxwzOQVpj031FeXIC2KSOiWUWjiOSXHBO1 E/dkm7taaD3N7d8XFGB5zswbY1dPQoj9V53/HgGNfMXzJyKIv40ZnYS0SIHJEYjfpww3 Zn4/D5+rY9XKl2WPVNKtwq6OKCMqOQurudOSUnCUj1yqf5KyYV7Zm0InqFsCsR54VuBe 9nlSfx/rM++t7nio/YCQCl2zaXp4MJygtDoVKPSlHzu46J6vQ/OTNTcmovA7kbTqoulp UrsfpdudQ2A5PzFrtJkFnpeagNCSPNw3hwTNqUlExEUxb57Irl4hwl7rol5S2Pk+fSCZ 3R7A==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=AQiNLdI6; 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-81303-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-81303-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id bx41-20020a056a02052900b005e45abbc54asi3597425pgb.186.2024.02.26.03.48.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Feb 2024 03:48:27 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-81303-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=AQiNLdI6; 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-81303-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-81303-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 483A0287286 for ; Mon, 26 Feb 2024 11:48:27 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 96C5421A06; Mon, 26 Feb 2024 11:48:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="AQiNLdI6"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="gKGLj7yO" 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 845041D54B; Mon, 26 Feb 2024 11:48:08 +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=1708948090; cv=none; b=tm9bvL6fw4AAAnX3RxUuhPcCVZZAPNFx26aW+cgyfLOkCaAVIK0u/Yer6fUjXG0LVyjLeqc+cPfSxZHmeYocWRPY03OrOeH4snycsVovAXTuij3vYVSYCRp/EfggX6zyOljCPbXZ/x+rPwm3mAsOOdAx/2Pl5x/BMX/s8fyCUZM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708948090; c=relaxed/simple; bh=B/tkQbR9U4S9kEOpfs0djvn9pb0/iN+UsrDa6kyyQYw=; h=Date:From:To:Subject:Cc:MIME-Version:Message-ID:Content-Type; b=iI3uaATSCUmUjQslECesNv2gV6ly2hpk5b+4Mkp4PnldC5ejZvFGP5xIE5kD/umTCHEky3WMB0ppjmmEvpcuuKU/+KB6xa1Pqur/ZzVZFdz3EfmzWm1vNCDLI1/uP9dCcogGFT/uZNVXM19fweLCgxOGIplv1GWtctRi43SgfAM= 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=AQiNLdI6; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=gKGLj7yO; 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: Mon, 26 Feb 2024 11:48:05 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1708948086; 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=gtCLZIY7ypiDdoCqSBLWsntMRCB2Ts4tl7NPSt9FmyM=; b=AQiNLdI6Tnuz409Y0t2B/s5zpAa3oiObB8VEYpv+0PxmMT5vVkbP4xGljdP6vzw9SpVXmW HKpap+ZfYTxqrVRKy5Kr1KkjJfB2anbqR9C3cZG5UMX4bIJZ3MiUYj05BikRIuoC+CxYIo 6i/KtwTJV0/ZBjx/BiuXIVLTN94mFCWIGdTRuJ3PFD2gFrvZq73Z5CZN4b3MVKaXEN2tTm yifkIiqyMLPJ9xnT1PKPoRRKO1cEaFE/mU3Z7qV4ryf9+RBEbhBIf4Db26a/P5Ysu0oQGI P/CrsOtS33nQvqnOWiPAFjSczDOAaTNLAwHltf2HHbarfTdgKcG3F9h5ZnsYEQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1708948086; 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=gtCLZIY7ypiDdoCqSBLWsntMRCB2Ts4tl7NPSt9FmyM=; b=gKGLj7yOrtoQmHvHmH8syIgKDgLAwG3x4o2iJypSIFc/om+hvIk32ZOqOOyzp2jr53xvgK mS+XxUdndG0p+yBw== 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] x86/apic: Build the x86 topology enumeration functions on UP APIC builds 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: <170894808573.398.6836010228517643879.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: 1791961970662729330 X-GMAIL-MSGID: 1791961970662729330 The following commit has been merged into the x86/apic branch of tip: Commit-ID: 62aaed88843a9a69b5614f99ec4a2930edd09658 Gitweb: https://git.kernel.org/tip/62aaed88843a9a69b5614f99ec4a2930edd09658 Author: Ingo Molnar AuthorDate: Mon, 26 Feb 2024 12:07:31 +01:00 Committer: Ingo Molnar CommitterDate: Mon, 26 Feb 2024 12:14:42 +01:00 x86/apic: Build the x86 topology enumeration functions on UP APIC builds too These functions are mostly pointless on UP, but nevertheless the 64-bit UP APIC build already depends on the existence of topology_apply_cmdline_limits_early(), which caused a build bug, resolve it by making them available under CONFIG_X86_LOCAL_APIC, as their prototypes already are. Reviewed-by: Thomas Gleixner Cc: linux-kernel@vger.kernel.org Signed-off-by: Ingo Molnar --- arch/x86/kernel/cpu/topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/topology.c b/arch/x86/kernel/cpu/topology.c index 41dd8e0..43650fe 100644 --- a/arch/x86/kernel/cpu/topology.c +++ b/arch/x86/kernel/cpu/topology.c @@ -344,7 +344,7 @@ void topology_hotunplug_apic(unsigned int cpu) } #endif -#ifdef CONFIG_SMP +#ifdef CONFIG_X86_LOCAL_APIC static unsigned int max_possible_cpus __initdata = NR_CPUS; /**