diff options
| author | scottl <scottl@FreeBSD.org> | 2014-04-26 20:27:54 +0000 |
|---|---|---|
| committer | scottl <scottl@FreeBSD.org> | 2014-04-26 20:27:54 +0000 |
| commit | 62a64f0d2b367aa304943ab5c8508059744c6016 (patch) | |
| tree | 011b9f559b2fe7a4b0f730214125d5b9ed735d61 /sys/i386 | |
| parent | c08e3d03ca9c9ffe7fff07eaa4e6bc25d451b871 (diff) | |
| download | FreeBSD-src-62a64f0d2b367aa304943ab5c8508059744c6016.zip FreeBSD-src-62a64f0d2b367aa304943ab5c8508059744c6016.tar.gz | |
Retire smp_active. It was racey and caused demonstrated problems with
the cpufreq code. Replace its use with smp_started. There's at least
one userland tool that still looks at the kern.smp.active sysctl, so
preserve it but point it to smp_started as well.
Discussed with: peter, jhb
MFC after: 3 days
Obtained from: Netflix
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/i386/mp_machdep.c | 1 | ||||
| -rw-r--r-- | sys/i386/i386/vm_machdep.c | 2 | ||||
| -rw-r--r-- | sys/i386/xen/mp_machdep.c | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c index 53ac6df..222e8e2 100644 --- a/sys/i386/i386/mp_machdep.c +++ b/sys/i386/i386/mp_machdep.c @@ -805,7 +805,6 @@ init_secondary(void) if (smp_cpus == mp_ncpus) { /* enable IPI's, tlb shootdown, freezes etc */ atomic_store_rel_int(&smp_started, 1); - smp_active = 1; /* historic */ } mtx_unlock_spin(&ap_boot_mtx); diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c index 3562954..78cc9c9 100644 --- a/sys/i386/i386/vm_machdep.c +++ b/sys/i386/i386/vm_machdep.c @@ -619,7 +619,7 @@ cpu_reset() cpuset_t map; u_int cnt; - if (smp_active) { + if (smp_started) { map = all_cpus; CPU_CLR(PCPU_GET(cpuid), &map); CPU_NAND(&map, &stopped_cpus); diff --git a/sys/i386/xen/mp_machdep.c b/sys/i386/xen/mp_machdep.c index 1bc6572..165b319 100644 --- a/sys/i386/xen/mp_machdep.c +++ b/sys/i386/xen/mp_machdep.c @@ -655,7 +655,6 @@ init_secondary(void) if (smp_cpus == mp_ncpus) { /* enable IPI's, tlb shootdown, freezes etc */ atomic_store_rel_int(&smp_started, 1); - smp_active = 1; /* historic */ } mtx_unlock_spin(&ap_boot_mtx); |
