From 5cecc030f86bf671a27d89547045f8c080d4d61c Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Mon, 3 Mar 2008 14:12:41 -0300 Subject: [PATCH] --- yaml --- r: 88709 b: refs/heads/master c: 7b1292e2371e3ae2ac69fbb899d539ddc7b53a27 h: refs/heads/master i: 88707: 1c45286ae780227e30733f32affc459797fb1c4b v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/mpparse_32.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 32041d5b6572..07ca1b4b43e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 93b016f8f393c1f8c27e8c4df06ad1420fac65f5 +refs/heads/master: 7b1292e2371e3ae2ac69fbb899d539ddc7b53a27 diff --git a/trunk/arch/x86/kernel/mpparse_32.c b/trunk/arch/x86/kernel/mpparse_32.c index f349e68e45a0..b2aded3fbfec 100644 --- a/trunk/arch/x86/kernel/mpparse_32.c +++ b/trunk/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]);