From patchwork Wed Aug 9 19:12:25 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: 133441 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp3020989vqr; Wed, 9 Aug 2023 12:19:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHGlp+QrWuXKT/tLfeWpT4siIqBjtOUKzBBPZa+AG2SRPZkHzFp7P4TBJnDdhSaPMNMZU5n X-Received: by 2002:a05:6a00:84e:b0:66c:9e97:aece with SMTP id q14-20020a056a00084e00b0066c9e97aecemr97341pfk.10.1691608789632; Wed, 09 Aug 2023 12:19:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691608789; cv=none; d=google.com; s=arc-20160816; b=yppl3+ZekBxdjQ3AmR8dnOBEUZFFotcACKVfTLXgRY9XJuivUHCZneCN9Pt/hEtUSO COE2ILqujiw6Xud2Arg6aSlq23YcD9uJKfd+YLn+/qf/wFtyN5xWGg1nR5m3s1e5QxVi pMhs9fncBvmiGodmf4hts26+rn7khaX1Mdvp27VE6RRxLCUEhT1Sobnm2+ZStD+kuL4x nQj5C6X9m429Swn6J4k2b/D6qqOcoY3aCQm8LiTwiGF6iwtyNb7aekvkax097LABlD3u ytY3mU6543JRhKGsu7SRlPc8BsHns4qvRFjPVAetmsaEQXp3kH7SNGnX8lz/efaXvvV1 jC4g== 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:cc:subject:to:reply-to:sender:from :dkim-signature:dkim-signature:date; bh=x5XCJnY1rrpq6ehSxamA971kpUww8ISxLLlpIRugkIU=; fh=3FMPXg1clC0XFY1ZACxx/y7ouyaFLdYpvKUPSe1hOrU=; b=Uqed3bJ3gHiXT4ItH9f2jGwUILZZJtfDT9Zjc5Vc5ixsKDvBGaNx5mZV2qT0AgtN+i zzbomhT8GhMRIat3ZpactLjQLuNpFPSiDadtkbN8UxFv6yHXVO7lqnbx0d9vb1VLBqGm ejr7BYKeWPdUOG81iowTaWGAOsZ1lEb+4k7fA4PJZMXfBldNkslnJrMXbGb+utsD6N2e 6rfotR9gpbFrCOScaObT0DzKgwjiLVmthXknQzDNkmUyKiw8flPfEnP8mBHzAhRmnewG 9zncOGTmy/Mdr4mbd+z9WoyVYmRua1mR7pPM7RHsfQYZmSd+5SBMXfKW3R2lCUhy0EEk 3hmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=jkNDq8NF; dkim=neutral (no key) header.i=@linutronix.de; 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 p4-20020a056a000a0400b0068730ff62dasi10298294pfh.60.2023.08.09.12.19.33; Wed, 09 Aug 2023 12:19:49 -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=jkNDq8NF; dkim=neutral (no key) header.i=@linutronix.de; 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 S233433AbjHITOP (ORCPT + 99 others); Wed, 9 Aug 2023 15:14:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42042 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229639AbjHITNh (ORCPT ); Wed, 9 Aug 2023 15:13:37 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B54CF30E9; Wed, 9 Aug 2023 12:12:53 -0700 (PDT) Date: Wed, 09 Aug 2023 19:12:25 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1691608346; 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=x5XCJnY1rrpq6ehSxamA971kpUww8ISxLLlpIRugkIU=; b=jkNDq8NFfWjf/AxRpfYOGhZ5fJet2KAH1tPXtEEQ2j/pHyRMK1/hc7HbPpBHTG+DpYsKAd jh9HIzH73s5HMvvgoRqU3gwDNBgeC/t9/5Y22BfSe8rb1IwtE/qyFsOZR1H4VSnEX/sBNB UddhsswdKAeDipY3hTD3NFLghUdhAphFvuXxLgqh6Jx4IgzvQhsV6GCVuvGtUeRvzyh5bn DkmJ1T7d+S1z9gUMmQLZfQt9o0IULiVFH+y6Jz9LXv1xz9dKns7hyNdP2NXv72jpwvs5/9 4bytJdCxpkzDqZtl5kQCkCEZjqSu3+BPMFs5rJ1njGewRt9PKfuoaLsBxRpWRg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1691608346; 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=x5XCJnY1rrpq6ehSxamA971kpUww8ISxLLlpIRugkIU=; b=/qaw/eykOVgRwHgdR/lnS9z2ncaDzHUHHTafEG04tkt+NdZE3DF1ZToxfXxXH0hJhSwMAw MUL249ZTU2874FCg== From: "tip-bot2 for Dave Hansen" 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: Remove mpparse 'apicid' variable Cc: Dave Hansen , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <169160834565.27769.5763058021367629941.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,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: INBOX X-GMAIL-THRID: 1773767552720272654 X-GMAIL-MSGID: 1773780378324017319 The following commit has been merged into the x86/apic branch of tip: Commit-ID: 004671e5c9335736ef808482bfc69cccd93cccc5 Gitweb: https://git.kernel.org/tip/004671e5c9335736ef808482bfc69cccd93cccc5 Author: Dave Hansen AuthorDate: Tue, 08 Aug 2023 15:03:47 -07:00 Committer: Dave Hansen CommitterDate: Wed, 09 Aug 2023 11:58:19 -07:00 x86/apic: Remove mpparse 'apicid' variable From: Dave Hansen Some truly ancient code had different ways of calculating the 'apicid' but it is long gone. Zap the unnecssary local variablee Signed-off-by: Dave Hansen --- arch/x86/kernel/mpparse.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c index 82518c1..333dee2 100644 --- a/arch/x86/kernel/mpparse.c +++ b/arch/x86/kernel/mpparse.c @@ -48,7 +48,6 @@ static int __init mpf_checksum(unsigned char *mp, int len) static void __init MP_processor_info(struct mpc_cpu *m) { - int apicid; char *bootup_cpu = ""; if (!(m->cpuflag & CPU_ENABLED)) { @@ -56,13 +55,11 @@ static void __init MP_processor_info(struct mpc_cpu *m) return; } - apicid = m->apicid; - if (m->cpuflag & CPU_BOOTPROCESSOR) bootup_cpu = " (Bootup-CPU)"; pr_info("Processor #%d%s\n", m->apicid, bootup_cpu); - generic_processor_info(apicid); + generic_processor_info(m->apicid); } #ifdef CONFIG_X86_IO_APIC