x86/apic: Remove mpparse 'apicid' variable

hansendc · hansendc · commit 004671e5c933 · 2023-08-09T11:58:19.000-07:00
From: Dave Hansen &lt;dave.hansen@linux.intel.com&gt;

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 &lt;dave.hansen@linux.intel.com&gt;
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
@@ -48,21 +48,18 @@ 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)) {
 		disabled_cpus++;
 		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

Original file line number	Diff line number	Diff line change
`@@ -48,21 +48,18 @@ static int __init mpf_checksum(unsigned char *mp, int len)`
`48`	`48`
`49`	`49`	`static void __init MP_processor_info(struct mpc_cpu *m)`
`50`	`50`	`{`
`51`		`- int apicid;`
`52`	`51`	`char *bootup_cpu = "";`
`53`	`52`
`54`	`53`	`if (!(m->cpuflag & CPU_ENABLED)) {`
`55`	`54`	`disabled_cpus++;`
`56`	`55`	`return;`
`57`	`56`	`}`
`58`	`57`
`59`		`- apicid = m->apicid;`
`60`		`-`
`61`	`58`	`if (m->cpuflag & CPU_BOOTPROCESSOR)`
`62`	`59`	`bootup_cpu = " (Bootup-CPU)";`
`63`	`60`
`64`	`61`	`pr_info("Processor #%d%s\n", m->apicid, bootup_cpu);`
`65`		`- generic_processor_info(apicid);`
	`62`	`+ generic_processor_info(m->apicid);`
`66`	`63`	`}`
`67`	`64`
`68`	`65`	`#ifdef CONFIG_X86_IO_APIC`