diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2002-04-02 22:19:16 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2002-04-02 22:19:16 +0000 |
| commit | c53c013bae4d2813cfdf899b712f649ccd686012 (patch) | |
| tree | a511bf3088c2455af875faa67fac4fc49ade8493 /sys/pc98 | |
| parent | 43e73ba0c27be6b3a25c57ec74315afe24b2aa38 (diff) | |
Notes
Diffstat (limited to 'sys/pc98')
| -rw-r--r-- | sys/pc98/i386/machdep.c | 11 | ||||
| -rw-r--r-- | sys/pc98/pc98/machdep.c | 11 |
2 files changed, 2 insertions, 20 deletions
diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c index 8c904dc09b0f..9e63dccd0d8d 100644 --- a/sys/pc98/i386/machdep.c +++ b/sys/pc98/i386/machdep.c @@ -223,8 +223,6 @@ static struct trapframe proc0_tf; static struct pcpu __pcpu; #endif -struct mtx sched_lock; -struct mtx Giant; struct mtx icu_lock; static void @@ -1757,12 +1755,8 @@ init386(first) pcpu_init(pc, 0, sizeof(struct pcpu)); PCPU_SET(prvspace, pc); - - /* setup curproc so that mutexes work */ PCPU_SET(curthread, &thread0); - LIST_INIT(&thread0.td_contested); - /* * Initialize mutexes. * @@ -1771,12 +1765,9 @@ init386(first) * must be able to get the icu lock, so it can't be * under witness. */ - mtx_init(&Giant, "Giant", MTX_DEF | MTX_RECURSE); - mtx_init(&sched_lock, "sched lock", MTX_SPIN | MTX_RECURSE); - mtx_init(&proc0.p_mtx, "process lock", MTX_DEF|MTX_DUPOK); + mutex_init(); mtx_init(&clock_lock, "clk", MTX_SPIN | MTX_RECURSE); mtx_init(&icu_lock, "icu", MTX_SPIN | MTX_NOWITNESS); - mtx_lock(&Giant); /* make ldt memory segments */ /* diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c index 8c904dc09b0f..9e63dccd0d8d 100644 --- a/sys/pc98/pc98/machdep.c +++ b/sys/pc98/pc98/machdep.c @@ -223,8 +223,6 @@ static struct trapframe proc0_tf; static struct pcpu __pcpu; #endif -struct mtx sched_lock; -struct mtx Giant; struct mtx icu_lock; static void @@ -1757,12 +1755,8 @@ init386(first) pcpu_init(pc, 0, sizeof(struct pcpu)); PCPU_SET(prvspace, pc); - - /* setup curproc so that mutexes work */ PCPU_SET(curthread, &thread0); - LIST_INIT(&thread0.td_contested); - /* * Initialize mutexes. * @@ -1771,12 +1765,9 @@ init386(first) * must be able to get the icu lock, so it can't be * under witness. */ - mtx_init(&Giant, "Giant", MTX_DEF | MTX_RECURSE); - mtx_init(&sched_lock, "sched lock", MTX_SPIN | MTX_RECURSE); - mtx_init(&proc0.p_mtx, "process lock", MTX_DEF|MTX_DUPOK); + mutex_init(); mtx_init(&clock_lock, "clk", MTX_SPIN | MTX_RECURSE); mtx_init(&icu_lock, "icu", MTX_SPIN | MTX_NOWITNESS); - mtx_lock(&Giant); /* make ldt memory segments */ /* |