diff options
| author | attilio <attilio@FreeBSD.org> | 2011-05-13 14:57:20 +0000 |
|---|---|---|
| committer | attilio <attilio@FreeBSD.org> | 2011-05-13 14:57:20 +0000 |
| commit | ebb514a54a986a57e6598abb60f6972023bfff8f (patch) | |
| tree | fd49b09c9c11b5a6cb55bc601df0e4cbf31f9286 /sys/ia64 | |
| parent | 99e65551b9bcfa3dd0f837068d871552f6501af3 (diff) | |
| download | FreeBSD-src-ebb514a54a986a57e6598abb60f6972023bfff8f.zip FreeBSD-src-ebb514a54a986a57e6598abb60f6972023bfff8f.tar.gz | |
Fix remaining bits that actually weren't converted by mistake.
Reported by: sbruno
Diffstat (limited to 'sys/ia64')
| -rw-r--r-- | sys/ia64/ia64/mp_machdep.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/ia64/ia64/mp_machdep.c b/sys/ia64/ia64/mp_machdep.c index 0153785..e3df54a 100644 --- a/sys/ia64/ia64/mp_machdep.c +++ b/sys/ia64/ia64/mp_machdep.c @@ -286,7 +286,7 @@ cpu_mp_add(u_int acpi_id, u_int id, u_int eid) cpuid = (IA64_LID_GET_SAPIC_ID(ia64_get_lid()) == sapic_id) ? 0 : smp_cpus++; - KASSERT((all_cpus & (1UL << cpuid)) == 0, + KASSERT(!CPU_ISSET(cpuid, &all_cpus), ("%s: cpu%d already in CPU map", __func__, acpi_id)); if (cpuid != 0) { @@ -300,7 +300,7 @@ cpu_mp_add(u_int acpi_id, u_int id, u_int eid) pc->pc_acpi_id = acpi_id; pc->pc_md.lid = IA64_LID_SET_SAPIC_ID(sapic_id); - all_cpus |= (1UL << pc->pc_cpuid); + CPU_SET(pc->pc_cpuid, &all_cpus); } void @@ -359,7 +359,8 @@ cpu_mp_start() SLIST_FOREACH(pc, &cpuhead, pc_allcpu) { pc->pc_md.current_pmap = kernel_pmap; - pc->pc_other_cpus = all_cpus & ~pc->pc_cpumask; + pc->pc_other_cpus = all_cpus; + CPU_NAND(&pc->pc_other_cpus, &pc->pc_cpumask); /* The BSP is obviously running already. */ if (pc->pc_cpuid == 0) { pc->pc_md.awake = 1; |
