diff options
author | jeff <jeff@FreeBSD.org> | 2007-07-18 20:46:06 +0000 |
---|---|---|
committer | jeff <jeff@FreeBSD.org> | 2007-07-18 20:46:06 +0000 |
commit | e6da269e0c81bfd4d63b7981e09235214abc829b (patch) | |
tree | 1cec5f9b6fd3f83bab6f74433bc23a958956c5c2 /sys/kern | |
parent | 45491c3f8a107cfdeb617dc9821d7b8eedda4bbe (diff) | |
download | FreeBSD-src-e6da269e0c81bfd4d63b7981e09235214abc829b.zip FreeBSD-src-e6da269e0c81bfd4d63b7981e09235214abc829b.tar.gz |
- Remove the global definition of sched_lock in mutex.h to break
new code and third party modules which try to depend on it.
- Initialize sched_lock in sched_4bsd.c.
- Declare sched_lock in sparc64 pmap.c and assert that we're compiling
with SCHED_4BSD to prevent accidental crashes from running ULE. This
is the sole remaining file outside of the scheduler that uses the
global sched_lock.
Approved by: re
Diffstat (limited to 'sys/kern')
-rw-r--r-- | sys/kern/kern_mutex.c | 2 | ||||
-rw-r--r-- | sys/kern/sched_4bsd.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c index 426c1b3..58f2533 100644 --- a/sys/kern/kern_mutex.c +++ b/sys/kern/kern_mutex.c @@ -118,7 +118,6 @@ struct lock_class lock_class_mtx_spin = { * System-wide mutexes */ struct mtx blocked_lock; -struct mtx sched_lock; struct mtx Giant; #ifdef LOCK_PROFILING @@ -775,7 +774,6 @@ mutex_init(void) * Initialize mutexes. */ mtx_init(&Giant, "Giant", NULL, MTX_DEF | MTX_RECURSE); - mtx_init(&sched_lock, "sched lock", NULL, MTX_SPIN | MTX_RECURSE); mtx_init(&blocked_lock, "blocked lock", NULL, MTX_SPIN); blocked_lock.mtx_lock = 0xdeadc0de; /* Always blocked. */ mtx_init(&proc0.p_mtx, "process lock", NULL, MTX_DEF | MTX_DUPOK); diff --git a/sys/kern/sched_4bsd.c b/sys/kern/sched_4bsd.c index 7e368bb..d96c27e 100644 --- a/sys/kern/sched_4bsd.c +++ b/sys/kern/sched_4bsd.c @@ -101,6 +101,7 @@ struct td_sched { ((ts)->ts_runq != 0 && (ts)->ts_runq != &runq) static struct td_sched td_sched0; +struct mtx sched_lock; static int sched_tdcnt; /* Total runnable threads in the system. */ static int sched_quantum; /* Roundrobin scheduling quantum in ticks. */ @@ -578,6 +579,7 @@ schedinit(void) thread0.td_sched = &td_sched0; thread0.td_lock = &sched_lock; td_sched0.ts_thread = &thread0; + mtx_init(&sched_lock, "sched lock", NULL, MTX_SPIN | MTX_RECURSE); } int |