From b19d3ea0e21b0dc767f57b08497f4dcc4bcd9bda Mon Sep 17 00:00:00 2001 From: peter Date: Sat, 5 Jan 2002 09:41:37 +0000 Subject: Convert a bunch of 1 << PCPU_GET(cpuid) to PCPU_GET(cpumask). --- sys/amd64/amd64/mp_machdep.c | 4 ++-- sys/amd64/amd64/mptable.c | 4 ++-- sys/amd64/amd64/pmap.c | 6 +++--- sys/amd64/include/mptable.h | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'sys/amd64') 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)); -- cgit v1.1