diff options
author | scottl <scottl@FreeBSD.org> | 2014-05-07 20:28:27 +0000 |
---|---|---|
committer | scottl <scottl@FreeBSD.org> | 2014-05-07 20:28:27 +0000 |
commit | 96be897ce1e8a19c5a802c09f4d55a7c17ed9894 (patch) | |
tree | 9e592a28f4314467ab6a5bd9e845ba7c968df512 /sys/amd64 | |
parent | 76892e1ddc1fc146dd77aa7e4f27a87b743ef731 (diff) | |
download | FreeBSD-src-96be897ce1e8a19c5a802c09f4d55a7c17ed9894.zip FreeBSD-src-96be897ce1e8a19c5a802c09f4d55a7c17ed9894.tar.gz |
Merge r264984
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.
Obtained from: Netflix, Inc.
Diffstat (limited to 'sys/amd64')
-rw-r--r-- | sys/amd64/amd64/mp_machdep.c | 1 | ||||
-rw-r--r-- | sys/amd64/amd64/vm_machdep.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index 862b5ca..e09730d 100644 --- a/sys/amd64/amd64/mp_machdep.c +++ b/sys/amd64/amd64/mp_machdep.c @@ -771,7 +771,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 */ } /* diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c index 12f4978..ae0a003 100644 --- a/sys/amd64/amd64/vm_machdep.c +++ b/sys/amd64/amd64/vm_machdep.c @@ -597,7 +597,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); |