summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlauber Costa <gcosta@redhat.com>2008-03-03 18:12:41 +0100
committerIngo Molnar <mingo@elte.hu>2008-04-17 17:40:53 +0200
commit7b1292e2371e3ae2ac69fbb899d539ddc7b53a27 (patch)
treee18c0668c0245f7096fe0a31771133ce96ea8af7
parentx86: move disabled_cpus to common header (diff)
downloadlinux-7b1292e2371e3ae2ac69fbb899d539ddc7b53a27.tar.xz
linux-7b1292e2371e3ae2ac69fbb899d539ddc7b53a27.zip
x86: use disabled_cpus in i386
this patch allows a cpu to be marked as present but disabled in i386, just as x86_64 currently does. Signed-off-by: Glauber Costa <gcosta@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/mpparse_32.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/kernel/mpparse_32.c b/arch/x86/kernel/mpparse_32.c
index f349e68e45a0..b2aded3fbfec 100644
--- a/arch/x86/kernel/mpparse_32.c
+++ b/arch/x86/kernel/mpparse_32.c
@@ -70,6 +70,8 @@ unsigned int boot_cpu_physical_apicid = -1U;
/* Internal processor count */
unsigned int num_processors;
+unsigned disabled_cpus __cpuinitdata;
+
/* Bitmask of physically existing CPUs */
physid_mask_t phys_cpu_present_map;
@@ -108,8 +110,10 @@ static void __cpuinit MP_processor_info (struct mpc_config_processor *m)
int ver, apicid;
physid_mask_t phys_cpu;
- if (!(m->mpc_cpuflag & CPU_ENABLED))
+ if (!(m->mpc_cpuflag & CPU_ENABLED)) {
+ disabled_cpus++;
return;
+ }
apicid = mpc_apic_id(m, translation_table[mpc_record]);