Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e84d1c3 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

[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: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarAndrey Panin <pazke@donpac.ru>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b6260cd3

arch/i386/kernel/mpparse.c

+0 −2
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ unsigned long mp_lapic_addr; 


/* Processor that is doing the boot up */

unsigned int boot_cpu_physical_apicid = -1U;

unsigned int boot_cpu_logical_apicid = -1U;

/* Internal processor count */

static unsigned int __initdata num_processors;
@@ -180,7 +179,6 @@ static void __init MP_processor_info (struct mpc_config_processor *m) 
	if (m->mpc_cpuflag & CPU_BOOTPROCESSOR) {

		Dprintk("    Bootup CPU\n");

		boot_cpu_physical_apicid = m->mpc_apicid;

		boot_cpu_logical_apicid = apicid;

	}



	if (num_processors >= NR_CPUS) {

arch/i386/mach-visws/mpparse.c

+1 −4
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ unsigned long mp_lapic_addr; 


/* Processor that is doing the boot up */

unsigned int boot_cpu_physical_apicid = -1U;

unsigned int boot_cpu_logical_apicid = -1U;



/* Bitmask of physically existing CPUs */

physid_mask_t phys_cpu_present_map;
@@ -52,10 +51,8 @@ static void __init MP_processor_info (struct mpc_config_processor *m) 
		(m->mpc_cpufeature & CPU_MODEL_MASK) >> 4,

		m->mpc_apicver);



	if (m->mpc_cpuflag & CPU_BOOTPROCESSOR) {

	if (m->mpc_cpuflag & CPU_BOOTPROCESSOR)

		boot_cpu_physical_apicid = m->mpc_apicid;

		boot_cpu_logical_apicid = logical_apicid;

	}



	ver = m->mpc_apicver;

	if ((ver >= 0x14 && m->mpc_apicid >= 0xff) || m->mpc_apicid >= 0xf) {