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/kern/kern_cpu.c | |
| 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/kern/kern_cpu.c')
| -rw-r--r-- | sys/kern/kern_cpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/kern/kern_cpu.c b/sys/kern/kern_cpu.c index 6df4d3f..b0de2a2 100644 --- a/sys/kern/kern_cpu.c +++ b/sys/kern/kern_cpu.c @@ -268,7 +268,7 @@ cf_set_method(device_t dev, const struct cf_level *level, int priority) * switching the main CPU. XXXTODO: Need to think more about how to * handle having different CPUs at different frequencies. */ - if (mp_ncpus > 1 && !smp_active) { + if (mp_ncpus > 1 && !smp_started) { device_printf(dev, "rejecting change, SMP not started yet\n"); error = ENXIO; goto out; |
