diff options
author | Adrian Bunk <bunk@stusta.de> | 2005-06-25 17:59:12 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 19:25:05 -0400 |
commit | 9e84d1c36a505765c12e90289c9dbd575332840b (patch) | |
tree | eb8559de8a421a0bad838a1714d529157013cea6 /arch/i386/mach-visws/mpparse.c | |
parent | b6260cd354ec2b3ec026d6c899dc01e442b5e6cc (diff) |
[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>
Diffstat (limited to 'arch/i386/mach-visws/mpparse.c')
-rw-r--r-- | arch/i386/mach-visws/mpparse.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/i386/mach-visws/mpparse.c b/arch/i386/mach-visws/mpparse.c index 5a22082147f4..5f3d7e6de37b 100644 --- a/arch/i386/mach-visws/mpparse.c +++ b/arch/i386/mach-visws/mpparse.c | |||
@@ -23,7 +23,6 @@ unsigned long mp_lapic_addr; | |||
23 | 23 | ||
24 | /* Processor that is doing the boot up */ | 24 | /* Processor that is doing the boot up */ |
25 | unsigned int boot_cpu_physical_apicid = -1U; | 25 | unsigned int boot_cpu_physical_apicid = -1U; |
26 | unsigned int boot_cpu_logical_apicid = -1U; | ||
27 | 26 | ||
28 | /* Bitmask of physically existing CPUs */ | 27 | /* Bitmask of physically existing CPUs */ |
29 | physid_mask_t phys_cpu_present_map; | 28 | physid_mask_t phys_cpu_present_map; |
@@ -52,10 +51,8 @@ static void __init MP_processor_info (struct mpc_config_processor *m) | |||
52 | (m->mpc_cpufeature & CPU_MODEL_MASK) >> 4, | 51 | (m->mpc_cpufeature & CPU_MODEL_MASK) >> 4, |
53 | m->mpc_apicver); | 52 | m->mpc_apicver); |
54 | 53 | ||
55 | if (m->mpc_cpuflag & CPU_BOOTPROCESSOR) { | 54 | if (m->mpc_cpuflag & CPU_BOOTPROCESSOR) |
56 | boot_cpu_physical_apicid = m->mpc_apicid; | 55 | boot_cpu_physical_apicid = m->mpc_apicid; |
57 | boot_cpu_logical_apicid = logical_apicid; | ||
58 | } | ||
59 | 56 | ||
60 | ver = m->mpc_apicver; | 57 | ver = m->mpc_apicver; |
61 | if ((ver >= 0x14 && m->mpc_apicid >= 0xff) || m->mpc_apicid >= 0xf) { | 58 | if ((ver >= 0x14 && m->mpc_apicid >= 0xff) || m->mpc_apicid >= 0xf) { |