summaryrefslogtreecommitdiffstats
path: root/sys/amd64
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2002-01-05 09:41:37 +0000
committerpeter <peter@FreeBSD.org>2002-01-05 09:41:37 +0000
commitb19d3ea0e21b0dc767f57b08497f4dcc4bcd9bda (patch)
tree20b88f57275b83dc0c9ea9823c18ec1a663b2438 /sys/amd64
parent5e902a48f6ffa366d3573e7e7b3c571d7f384c9b (diff)
downloadFreeBSD-src-b19d3ea0e21b0dc767f57b08497f4dcc4bcd9bda.zip
FreeBSD-src-b19d3ea0e21b0dc767f57b08497f4dcc4bcd9bda.tar.gz
Convert a bunch of 1 << PCPU_GET(cpuid) to PCPU_GET(cpumask).
Diffstat (limited to 'sys/amd64')
-rw-r--r--sys/amd64/amd64/mp_machdep.c4
-rw-r--r--sys/amd64/amd64/mptable.c4
-rw-r--r--sys/amd64/amd64/pmap.c6
-rw-r--r--sys/amd64/include/mptable.h4
4 files changed, 9 insertions, 9 deletions
diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index 1feb66a..f4f9c52 100644
--- a/sys/amd64/amd64/mp_machdep.c
+++ b/sys/amd64/amd64/mp_machdep.c
@@ -1992,7 +1992,7 @@ start_all_aps(u_int boot_addr)
}
/* build our map of 'other' CPUs */
- PCPU_SET(other_cpus, all_cpus & ~(1 << PCPU_GET(cpuid)));
+ PCPU_SET(other_cpus, all_cpus & ~PCPU_GET(cpumask));
/* fill in our (BSP) APIC version */
cpu_apic_versions[0] = lapic.version;
@@ -2268,7 +2268,7 @@ ap_init(void)
smp_cpus++;
/* Build our map of 'other' CPUs. */
- PCPU_SET(other_cpus, all_cpus & ~(1 << PCPU_GET(cpuid)));
+ PCPU_SET(other_cpus, all_cpus & ~PCPU_GET(cpumask));
printf("SMP: AP CPU #%d Launched!\n", PCPU_GET(cpuid));
diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c
index 1feb66a..f4f9c52 100644
--- a/sys/amd64/amd64/mptable.c
+++ b/sys/amd64/amd64/mptable.c
@@ -1992,7 +1992,7 @@ start_all_aps(u_int boot_addr)
}
/* build our map of 'other' CPUs */
- PCPU_SET(other_cpus, all_cpus & ~(1 << PCPU_GET(cpuid)));
+ PCPU_SET(other_cpus, all_cpus & ~PCPU_GET(cpumask));
/* fill in our (BSP) APIC version */
cpu_apic_versions[0] = lapic.version;
@@ -2268,7 +2268,7 @@ ap_init(void)
smp_cpus++;
/* Build our map of 'other' CPUs. */
- PCPU_SET(other_cpus, all_cpus & ~(1 << PCPU_GET(cpuid)));
+ PCPU_SET(other_cpus, all_cpus & ~PCPU_GET(cpumask));
printf("SMP: AP CPU #%d Launched!\n", PCPU_GET(cpuid));
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index baa71b2..6075329 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -567,7 +567,7 @@ static __inline void
pmap_invalidate_page(pmap_t pmap, vm_offset_t va)
{
#if defined(SMP)
- if (pmap->pm_active & (1 << PCPU_GET(cpuid)))
+ if (pmap->pm_active & PCPU_GET(cpumask))
cpu_invlpg((void *)va);
if (pmap->pm_active & PCPU_GET(other_cpus))
smp_invltlb();
@@ -581,7 +581,7 @@ static __inline void
pmap_invalidate_all(pmap_t pmap)
{
#if defined(SMP)
- if (pmap->pm_active & (1 << PCPU_GET(cpuid)))
+ if (pmap->pm_active & PCPU_GET(cpumask))
cpu_invltlb();
if (pmap->pm_active & PCPU_GET(other_cpus))
smp_invltlb();
@@ -3409,7 +3409,7 @@ pmap_activate(struct thread *td)
pmap = vmspace_pmap(td->td_proc->p_vmspace);
#if defined(SMP)
- pmap->pm_active |= 1 << PCPU_GET(cpuid);
+ pmap->pm_active |= PCPU_GET(cpumask);
#else
pmap->pm_active |= 1;
#endif
diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h
index 1feb66a..f4f9c52 100644
--- a/sys/amd64/include/mptable.h
+++ b/sys/amd64/include/mptable.h
@@ -1992,7 +1992,7 @@ start_all_aps(u_int boot_addr)
}
/* build our map of 'other' CPUs */
- PCPU_SET(other_cpus, all_cpus & ~(1 << PCPU_GET(cpuid)));
+ PCPU_SET(other_cpus, all_cpus & ~PCPU_GET(cpumask));
/* fill in our (BSP) APIC version */
cpu_apic_versions[0] = lapic.version;
@@ -2268,7 +2268,7 @@ ap_init(void)
smp_cpus++;
/* Build our map of 'other' CPUs. */
- PCPU_SET(other_cpus, all_cpus & ~(1 << PCPU_GET(cpuid)));
+ PCPU_SET(other_cpus, all_cpus & ~PCPU_GET(cpumask));
printf("SMP: AP CPU #%d Launched!\n", PCPU_GET(cpuid));
OpenPOWER on IntegriCloud