[PATCH] i386: cleanup boot_cpu_logical_apicid variables

There are currently two different boot_cpu_logical_apicid variables:
- a global one in mpparse.c
- a static one in smpboot.c

Of these two, only the one in smpboot.c might be used (through
boot_cpu_apicid).

This patch therefore removes the one in mpparse.c .

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrey Panin <pazke@donpac.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Adrian Bunk and committed by
Linus Torvalds
9e84d1c3 b6260cd3

+1 -6
-2
arch/i386/kernel/mpparse.c
··· 67 68 /* Processor that is doing the boot up */ 69 unsigned int boot_cpu_physical_apicid = -1U; 70 - unsigned int boot_cpu_logical_apicid = -1U; 71 /* Internal processor count */ 72 static unsigned int __initdata num_processors; 73 ··· 179 if (m->mpc_cpuflag & CPU_BOOTPROCESSOR) { 180 Dprintk(" Bootup CPU\n"); 181 boot_cpu_physical_apicid = m->mpc_apicid; 182 - boot_cpu_logical_apicid = apicid; 183 } 184 185 if (num_processors >= NR_CPUS) {
··· 67 68 /* Processor that is doing the boot up */ 69 unsigned int boot_cpu_physical_apicid = -1U; 70 /* Internal processor count */ 71 static unsigned int __initdata num_processors; 72 ··· 180 if (m->mpc_cpuflag & CPU_BOOTPROCESSOR) { 181 Dprintk(" Bootup CPU\n"); 182 boot_cpu_physical_apicid = m->mpc_apicid; 183 } 184 185 if (num_processors >= NR_CPUS) {
+1 -4
arch/i386/mach-visws/mpparse.c
··· 23 24 /* Processor that is doing the boot up */ 25 unsigned int boot_cpu_physical_apicid = -1U; 26 - unsigned int boot_cpu_logical_apicid = -1U; 27 28 /* Bitmask of physically existing CPUs */ 29 physid_mask_t phys_cpu_present_map; ··· 51 (m->mpc_cpufeature & CPU_MODEL_MASK) >> 4, 52 m->mpc_apicver); 53 54 - if (m->mpc_cpuflag & CPU_BOOTPROCESSOR) { 55 boot_cpu_physical_apicid = m->mpc_apicid; 56 - boot_cpu_logical_apicid = logical_apicid; 57 - } 58 59 ver = m->mpc_apicver; 60 if ((ver >= 0x14 && m->mpc_apicid >= 0xff) || m->mpc_apicid >= 0xf) {
··· 23 24 /* Processor that is doing the boot up */ 25 unsigned int boot_cpu_physical_apicid = -1U; 26 27 /* Bitmask of physically existing CPUs */ 28 physid_mask_t phys_cpu_present_map; ··· 52 (m->mpc_cpufeature & CPU_MODEL_MASK) >> 4, 53 m->mpc_apicver); 54 55 + if (m->mpc_cpuflag & CPU_BOOTPROCESSOR) 56 boot_cpu_physical_apicid = m->mpc_apicid; 57 58 ver = m->mpc_apicver; 59 if ((ver >= 0x14 && m->mpc_apicid >= 0xff) || m->mpc_apicid >= 0xf) {