diff options
-rw-r--r-- | arch/i386/kernel/mpparse.c | 2 | ||||
-rw-r--r-- | arch/i386/mach-visws/mpparse.c | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/arch/i386/kernel/mpparse.c b/arch/i386/kernel/mpparse.c index 383a11600d2c..af917f609c7d 100644 --- a/arch/i386/kernel/mpparse.c +++ b/arch/i386/kernel/mpparse.c | |||
@@ -67,7 +67,6 @@ unsigned long mp_lapic_addr; | |||
67 | 67 | ||
68 | /* Processor that is doing the boot up */ | 68 | /* Processor that is doing the boot up */ |
69 | unsigned int boot_cpu_physical_apicid = -1U; | 69 | unsigned int boot_cpu_physical_apicid = -1U; |
70 | unsigned int boot_cpu_logical_apicid = -1U; | ||
71 | /* Internal processor count */ | 70 | /* Internal processor count */ |
72 | static unsigned int __initdata num_processors; | 71 | static unsigned int __initdata num_processors; |
73 | 72 | ||
@@ -180,7 +179,6 @@ static void __init MP_processor_info (struct mpc_config_processor *m) | |||
180 | if (m->mpc_cpuflag & CPU_BOOTPROCESSOR) { | 179 | if (m->mpc_cpuflag & CPU_BOOTPROCESSOR) { |
181 | Dprintk(" Bootup CPU\n"); | 180 | Dprintk(" Bootup CPU\n"); |
182 | boot_cpu_physical_apicid = m->mpc_apicid; | 181 | boot_cpu_physical_apicid = m->mpc_apicid; |
183 | boot_cpu_logical_apicid = apicid; | ||
184 | } | 182 | } |
185 | 183 | ||
186 | if (num_processors >= NR_CPUS) { | 184 | if (num_processors >= NR_CPUS) { |
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) { |