From patchwork Tue Feb 27 09:17:29 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: 207101 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp2580501dyb; Tue, 27 Feb 2024 01:17:55 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCW/Bizk0paAw4xFy3gwwz3toaWlQReFvNYExB/cMYAuo5A3rOinnX0r5HEZKr6DMEkoPUkQpmmCj4s+VEJ673owl3cppg== X-Google-Smtp-Source: AGHT+IEyRVoHN6MDVwdP330OMC9hM3wb/YnazMRgoCsPeG0I0qsug4daiMQkc++pZF9k8YFGxs2A X-Received: by 2002:a05:620a:8008:b0:787:9042:bb94 with SMTP id ee8-20020a05620a800800b007879042bb94mr1856119qkb.15.1709025475578; Tue, 27 Feb 2024 01:17:55 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709025475; cv=pass; d=google.com; s=arc-20160816; b=lZEJWFy9o72JyZbKPg8srKv/0L86q9WTA49rkATz9T7/r9ILpmRDponp+UM4JXx0eT PNRrnri1i4W4CnXisxCDl8HMAj8eDxyt3/f56WyZ0L00IQQm+5BNL50a3w2NTbnQxXbH NPpKgKv7V7zxExKc1ARGG1y3jiOMrVKHe95fMIIoyfv1FuPZBg55JcmMx7I90rzF87l2 eM6Gfm5D5FDxMqP4sXaeP3BoZ0C97UCoriN9XNKdcG0JowEh8NNbR5BGGCr9g5ezLOST 5LzJCrWSbxgCEt/7Fq5hllBxIyHjHV0YW/k9Q5QwtzIjEY9SuwvRwqsulBhgYwOo/7F2 OCsA== 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=9fgbmiMWFTH/oklQmtly+YNcKTjM9YSszW1qoUugtUA=; fh=UwftEdEwtg14ADOO3ZWAylrUQ27A8X0kqeA8E50kBPU=; b=atK2O/JgRQficQPghgZqnMF/DQeFoMBZ8nR0dU5VrFIMbK553sg6Hjqc7jDbnhbne3 XodsRhVZmVditdJXgQfGQQC+y+vWS6rfR0Oc1Wn7SL+YtlcQzgLs9GyVS+EzdcOn9Ex7 UMfhDjxoIpuneHOGcCCmcXToPRDrd/wpHG4ZRKqERlmMNVSqwlbFQxdmFavie2Lr9SWt rvF1ttJqiCGlbbSMMtOAJ2UU1h5dTipQG+coraDr4wHZgQWwXvcI3QX4GeUKAZcjOkrL yMfJScJTkou8DJDjoNzx6+LRdSGUDNkmwVmupsEubIR52I68cWrMAVgXsyLamA2u9Bc0 cYTw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=kyVw1IEk; 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-82938-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-82938-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 d13-20020a05620a204d00b007879e185ab6si6931284qka.559.2024.02.27.01.17.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Feb 2024 01:17:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-82938-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=kyVw1IEk; 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-82938-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-82938-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 5F5291C22213 for ; Tue, 27 Feb 2024 09:17:55 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6158F13667C; Tue, 27 Feb 2024 09:17:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="kyVw1IEk"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="ExSMK4vC" 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 254FA135A6A; 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=1709025455; cv=none; b=qnC90uPkIphWumZHp+yK5odqYymd1IFT+83+zHswEGJ+Yc0+YTTCplZXdizy/iSfHhP7LNHzjLcwDyYpT+mIM1QZ5xBPwp4uY4RmLFu7czRbCYQ7jQ10/Hyy5t1gvyrBRlIBpMdhIAffhSRyPjI7oEmJSRisgZnA2Fu7aIPcOds= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709025455; c=relaxed/simple; bh=k55bHilAyaIlk9wtrJdwgBquS5Dn+sW/L1lBd9Z2+Mo=; h=Date:From:To:Subject:Cc:MIME-Version:Message-ID:Content-Type; b=YD1jjXQgTrIm/MRf1A041vWbErtAIdJwUKCndz7Kwhi19YMTpeZDPyZfe0ZtuWdPyEB7vidxF1oyS7A2UzTjwkkw2dc6nHVszQNZ0sR4vsEMcBVZUjlefRbvtGm1mr2fuSurUZduzsDn55DNCOhdwsr8QkNjdc7sVer/81S0Dzk= 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=kyVw1IEk; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=ExSMK4vC; 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:29 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1709025450; 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=9fgbmiMWFTH/oklQmtly+YNcKTjM9YSszW1qoUugtUA=; b=kyVw1IEk7sxt2vobeSBUh91Y7p/YZ/WuoG5eoRznoPnJCZ4491Q3NxTgguv/Obi9+6pJSp 0DiBU0sfhOKBS4VqoJzB0Qum6Kfgh973LvGNmEAHul+urOX5p9bWL6AT1MJd89aG669H07 NvxItAFdsAcj/zEf8B49qOMWKX3fA4a8T0Pvh32ULpk9TTmAoNDst2HxpGxaxMr5Jny3H3 27eQjqbos69d1fJ89mqfnNDyBHQtNJisasXTj1GrKcdAlsqIjlDevNz1KmTbFkymBJBRB5 eC+n2aORgijd6RpA2gRfxOcJYZrueGOfBn45WDVsSGOrCyKoPi7FGclKNNYxCA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1709025450; 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=9fgbmiMWFTH/oklQmtly+YNcKTjM9YSszW1qoUugtUA=; b=ExSMK4vCqyOMlqU/IV4xbrUa/iwwFPp//Pnf+2i3cJhAr1SWqFjr8jTbwLfLeHaxkm7Evj cM/F5iFsufAKboAg== 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: <170902544934.398.11994373587542888621.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: 1792043096668448736 X-GMAIL-MSGID: 1792043096668448736 The following commit has been merged into the x86/apic branch of tip: Commit-ID: 6be4ec29685c216ebec61d35f56c3808092498aa Gitweb: https://git.kernel.org/tip/6be4ec29685c216ebec61d35f56c3808092498aa 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 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; /**