diff options
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_fork.c | 2 | ||||
| -rw-r--r-- | sys/kern/kern_idle.c | 4 | ||||
| -rw-r--r-- | sys/kern/kern_mutex.c | 4 | ||||
| -rw-r--r-- | sys/kern/kern_proc.c | 1 | ||||
| -rw-r--r-- | sys/kern/kern_switch.c | 4 |
5 files changed, 2 insertions, 13 deletions
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 162d019..310c3fc 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -72,7 +72,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_extern.h> #include <vm/uma.h> -#include <machine/critical.h> #ifndef _SYS_SYSPROTO_H_ struct fork_args { @@ -764,7 +763,6 @@ fork_exit(callout, arg, frame) sched_lock.mtx_lock = (uintptr_t)td; mtx_assert(&sched_lock, MA_OWNED | MA_NOTRECURSED); - cpu_critical_fork_exit(); CTR4(KTR_PROC, "fork_exit: new thread %p (kse %p, pid %d, %s)", td, td->td_sched, p->p_pid, p->p_comm); diff --git a/sys/kern/kern_idle.c b/sys/kern/kern_idle.c index 4997945..1b4d432 100644 --- a/sys/kern/kern_idle.c +++ b/sys/kern/kern_idle.c @@ -65,10 +65,6 @@ idle_setup(void *dummy) error = kthread_create(idle_proc, NULL, &p, RFSTOPPED | RFHIGHPID, 0, "idle: cpu%d", pc->pc_cpuid); pc->pc_idlethread = FIRST_THREAD_IN_PROC(p); - if (pc->pc_curthread == NULL) { - pc->pc_curthread = pc->pc_idlethread; - pc->pc_idlethread->td_critnest = 0; - } #else error = kthread_create(idle_proc, NULL, &p, RFSTOPPED | RFHIGHPID, 0, "idle"); diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c index ed8f7ec..886ca5d 100644 --- a/sys/kern/kern_mutex.c +++ b/sys/kern/kern_mutex.c @@ -586,7 +586,7 @@ _mtx_lock_spin(struct mtx *m, struct thread *td, int opts, const char *file, break; /* Give interrupts a chance while we spin. */ - critical_exit(); + spinlock_exit(); while (m->mtx_lock != MTX_UNOWNED) { if (i++ < 10000000) { cpu_spinwait(); @@ -605,7 +605,7 @@ _mtx_lock_spin(struct mtx *m, struct thread *td, int opts, const char *file, } cpu_spinwait(); } - critical_enter(); + spinlock_enter(); } if (LOCK_LOG_TEST(&m->mtx_object, opts)) diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 0b3ecfd..feb512e 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -63,7 +63,6 @@ __FBSDID("$FreeBSD$"); #include <vm/pmap.h> #include <vm/vm_map.h> #include <vm/uma.h> -#include <machine/critical.h> MALLOC_DEFINE(M_PGRP, "pgrp", "process group header"); MALLOC_DEFINE(M_SESSION, "session", "session header"); diff --git a/sys/kern/kern_switch.c b/sys/kern/kern_switch.c index 24a29cb..707a7f9 100644 --- a/sys/kern/kern_switch.c +++ b/sys/kern/kern_switch.c @@ -105,7 +105,6 @@ __FBSDID("$FreeBSD$"); #if defined(SMP) && (defined(__i386__) || defined(__amd64__)) #include <sys/smp.h> #endif -#include <machine/critical.h> #if defined(SMP) && defined(SCHED_4BSD) #include <sys/sysctl.h> #endif @@ -581,8 +580,6 @@ critical_enter(void) struct thread *td; td = curthread; - if (td->td_critnest == 0) - cpu_critical_enter(td); td->td_critnest++; CTR4(KTR_CRITICAL, "critical_enter by thread %p (%ld, %s) to %d", td, (long)td->td_proc->p_pid, td->td_proc->p_comm, td->td_critnest); @@ -610,7 +607,6 @@ critical_exit(void) } #endif td->td_critnest = 0; - cpu_critical_exit(td); } else { td->td_critnest--; } |
