diff options
author | attilio <attilio@FreeBSD.org> | 2010-08-12 13:46:43 +0000 |
---|---|---|
committer | attilio <attilio@FreeBSD.org> | 2010-08-12 13:46:43 +0000 |
commit | c47bc039c039f1716d8120d61cf6c65da5b441d5 (patch) | |
tree | 3bf907939d715434d8f9d4160db8e08994692b39 /sys/i386 | |
parent | 40ab8ae40364fe49a6171090d5d3fe606572c848 (diff) | |
download | FreeBSD-src-c47bc039c039f1716d8120d61cf6c65da5b441d5.zip FreeBSD-src-c47bc039c039f1716d8120d61cf6c65da5b441d5.tar.gz |
Revert r211176:
As long as interrupts are disabled and there is not explicit call to
sched_add() there can't be any preemption there, thus the calls may be
consistent.
Reported by: kib, jhb
Diffstat (limited to 'sys/i386')
-rw-r--r-- | sys/i386/i386/mp_machdep.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c index 1a89b70..ddbb631 100644 --- a/sys/i386/i386/mp_machdep.c +++ b/sys/i386/i386/mp_machdep.c @@ -1411,10 +1411,8 @@ cpustop_handler(void) cpumask_t cpumask; u_int cpu; - sched_pin(); cpu = PCPU_GET(cpuid); cpumask = PCPU_GET(cpumask); - sched_unpin(); savectx(&stoppcbs[cpu]); @@ -1588,14 +1586,10 @@ mp_grab_cpu_hlt(void) #endif int retval; -#ifdef MP_WATCHDOG - sched_pin(); mask = PCPU_GET(cpumask); +#ifdef MP_WATCHDOG cpuid = PCPU_GET(cpuid); - sched_unpin(); ap_watchdog(cpuid); -#else - mask = PCPU_GET(cpumask); #endif retval = 0; |