summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2010-07-29 17:37:35 +0000
committerjhb <jhb@FreeBSD.org>2010-07-29 17:37:35 +0000
commit01db50653014484bd125c408f349930b9ffbc575 (patch)
treec2a9ad5738c19a62b1daf08592c8230cf595a95d
parent3b372226747207f6ab37332bb870e6adcab653b2 (diff)
downloadFreeBSD-src-01db50653014484bd125c408f349930b9ffbc575.zip
FreeBSD-src-01db50653014484bd125c408f349930b9ffbc575.tar.gz
When performing a sanity check on the SRAT table to ensure that each
memory domain has an assigned CPU, ignore disabled CPUs. Previously disabled CPUs were counted as being in domain 0. Reported by: mdf
-rw-r--r--sys/x86/acpica/srat.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/x86/acpica/srat.c b/sys/x86/acpica/srat.c
index df15062..4b7df37 100644
--- a/sys/x86/acpica/srat.c
+++ b/sys/x86/acpica/srat.c
@@ -150,7 +150,8 @@ check_domains(void)
for (i = 0; i < num_mem; i++) {
found = 0;
for (j = 0; j <= MAX_APIC_ID; j++)
- if (cpus[j].domain == mem_info[i].domain) {
+ if (cpus[j].enabled &&
+ cpus[j].domain == mem_info[i].domain) {
cpus[j].has_memory = 1;
found++;
}
OpenPOWER on IntegriCloud