From patchwork Wed Aug 9 15:34:15 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: 133319 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp2892144vqr; Wed, 9 Aug 2023 08:55:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFRcsgJtu/I7BjbxG7RPL68yLkqK6qn+ugVmvKkddcFn5Vtgm3/qPID0mkBosqXEtHWmWeJ X-Received: by 2002:a17:907:a06b:b0:99b:6e54:bd5b with SMTP id ia11-20020a170907a06b00b0099b6e54bd5bmr2353233ejc.50.1691596558258; Wed, 09 Aug 2023 08:55:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691596558; cv=none; d=google.com; s=arc-20160816; b=Lu7p8BpFHQalgmlSbi7sZ3LGk49YjLjiMVkJ0+9mXVwJrbSOz+Yq9aEZ3vvQtrt2Sj QKaq787pva/TisCdmbKnR+SDaLi6AOEoAKPeU/umeaW+FXyMB8EUoAuhxre4nfs2Y+vb 37b8HN0RVQ8icWyhAM0pcFAxEFNdM0PWXCzFCRPNbx2kR+vutW+AbdChlwryqiCFOwK1 vtxJXz0LUm3qD3UEAijFzeOWs65zQ473FnpVGcRMTADPEhL7+Xj4/Mj1OrsT4fA2j9jw yyG6FiZX70hpNZa8zx4l8Fr6J5FCc8/kIv90TZGsHf9lRdUbOLo3vmTRnSVGx+2V5YoM buTw== 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=kOQZtyiV/mVte89ngBCCE+6bJeYbCHADhyyYFZMpk/I=; fh=3FMPXg1clC0XFY1ZACxx/y7ouyaFLdYpvKUPSe1hOrU=; b=vqaukWwAUEq9/GIyPw4zRNq42MWT2UgLKo0ZgZi6150Z4GFCDY6pluPS0xNCqg3a4s /VljIujOEq3qF3DXaFAjGyoHQOfuB9rAYasP7z/oD06OqJtMIxF4A04TUFj9nfE6rndj HwJUD3t6dR3XXQwMKvUq1lJBnlb3+PkGLm/ZQIjU7vp+v9hb4vtR/AnLW36ieHkyWw9T laqn2B0zowOK0oPElSOL80fgFBb4JCVNyxLZeEDbK5ER/wGybcDqfzhkZ9vfxwmBvc3j iSA4x139cDHTl1gW+1iYXPk1iXEH+oLk6NJ1ImUf3/WxE1U44+HSQl+jfokfKC2ePSka sLIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=Qs1IaYUA; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=ahHgAcli; 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 jr9-20020a170906a98900b0099bdfd4cc50si9734759ejb.830.2023.08.09.08.55.32; Wed, 09 Aug 2023 08:55:58 -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=Qs1IaYUA; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=ahHgAcli; 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 S234406AbjHIPek (ORCPT + 99 others); Wed, 9 Aug 2023 11:34:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37860 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233628AbjHIPeS (ORCPT ); Wed, 9 Aug 2023 11:34:18 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 99B551FFE; Wed, 9 Aug 2023 08:34:17 -0700 (PDT) Date: Wed, 09 Aug 2023 15:34:15 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1691595256; 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=kOQZtyiV/mVte89ngBCCE+6bJeYbCHADhyyYFZMpk/I=; b=Qs1IaYUAJKORn4Ctyc7GqnlA6WtApKqgEsqiqSuNXXGgM3u71lbS0VESY0xBKUWZhjVckG tHr1s6prWpkksW/sa1RKKxoTy9MCbeU8Lx+dwxgi1dWQZ3Fw8VK8G7fJ05W0BSSAbSvyTF d+NZWcXExpdaV/NdlUYsPe/DCIvmOo2kmydGrV7qU00/re8kSE/Fils2yYY8MnvFtcUlOJ 8t9oY9ZVrmonq3ls22cz4XVlNI1+02DyoWGg3+U6370kUSwvl/fWmm8IRQ3LQmZjnG/fBK Q8wvF5/mkUR0s3y8XluPOH5M0Ml+ED9MSYQibnFYvtDUTeTGfzsUT/f42JeLmw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1691595256; 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=kOQZtyiV/mVte89ngBCCE+6bJeYbCHADhyyYFZMpk/I=; b=ahHgAcliwREPMiPAhHyeYFzn6DWODqoClfuWSccOSeFvmeDz00YP4gcgvgusfABhzBD3ah zx8/WEvw97x1u1CQ== 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: <169159525576.27769.9210659733557995555.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,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: 1773767552720272654 The following commit has been merged into the x86/apic branch of tip: Commit-ID: 5339a560914093ea9c491a583e9df030308e0cb3 Gitweb: https://git.kernel.org/tip/5339a560914093ea9c491a583e9df030308e0cb3 Author: Dave Hansen AuthorDate: Tue, 08 Aug 2023 15:03:47 -07:00 Committer: Dave Hansen CommitterDate: Wed, 09 Aug 2023 08:10:11 -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