[tip:,x86/apic] x86/apic: Remove mpparse 'apicid' variable

Message ID 169160834565.27769.5763058021367629941.tip-bot2@tip-bot2
State New
Headers
Series [tip:,x86/apic] x86/apic: Remove mpparse 'apicid' variable |

Commit Message

tip-bot2 for Thomas Gleixner Aug. 9, 2023, 7:12 p.m. UTC
  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 <dave.hansen@linux.intel.com>
AuthorDate:    Tue, 08 Aug 2023 15:03:47 -07:00
Committer:     Dave Hansen <dave.hansen@linux.intel.com>
CommitterDate: Wed, 09 Aug 2023 11:58:19 -07:00

x86/apic: Remove mpparse 'apicid' variable

From: Dave Hansen <dave.hansen@linux.intel.com>

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 <dave.hansen@linux.intel.com>
---
 arch/x86/kernel/mpparse.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
  

Patch

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