diff options
| author | kato <kato@FreeBSD.org> | 2001-06-23 08:30:13 +0000 |
|---|---|---|
| committer | kato <kato@FreeBSD.org> | 2001-06-23 08:30:13 +0000 |
| commit | f770dedd8940425663a0f16a9ea7e5ca7666408d (patch) | |
| tree | a50ab71079d61399ed2a866fe2e5e2def36086c3 /sys/pc98 | |
| parent | c08a12b85cd5d78d4924415cbba41deb5fe357ee (diff) | |
| download | FreeBSD-src-f770dedd8940425663a0f16a9ea7e5ca7666408d.zip FreeBSD-src-f770dedd8940425663a0f16a9ea7e5ca7666408d.tar.gz | |
Merged from sys/i386/i386/machdep.c revisions 1.456 and 1.457.
Diffstat (limited to 'sys/pc98')
| -rw-r--r-- | sys/pc98/i386/machdep.c | 25 | ||||
| -rw-r--r-- | sys/pc98/pc98/machdep.c | 25 |
2 files changed, 16 insertions, 34 deletions
diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c index a5b0c4a..d12ef72 100644 --- a/sys/pc98/i386/machdep.c +++ b/sys/pc98/i386/machdep.c @@ -173,7 +173,7 @@ sysctl_hw_physmem(SYSCTL_HANDLER_ARGS) } SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_INT|CTLFLAG_RD, - 0, 0, sysctl_hw_physmem, "I", ""); + 0, 0, sysctl_hw_physmem, "IU", ""); static int sysctl_hw_usermem(SYSCTL_HANDLER_ARGS) @@ -184,7 +184,7 @@ sysctl_hw_usermem(SYSCTL_HANDLER_ARGS) } SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_INT|CTLFLAG_RD, - 0, 0, sysctl_hw_usermem, "I", ""); + 0, 0, sysctl_hw_usermem, "IU", ""); static int sysctl_hw_availpages(SYSCTL_HANDLER_ARGS) @@ -1949,20 +1949,16 @@ init386(first) LIST_INIT(&proc0.p_contested); - mtx_init(&sched_lock, "sched lock", MTX_SPIN | MTX_RECURSE); -#ifdef SMP - /* - * Interrupts can happen very early, so initialize imen_mtx here, rather - * than in init_locks(). - */ - mtx_init(&imen_mtx, "imen", MTX_SPIN); -#endif - /* - * Giant is used early for at least debugger traps and unexpected traps. + * Initialize mutexes. */ 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_init(&clock_lock, "clk", MTX_SPIN | MTX_RECURSE); +#ifdef SMP + mtx_init(&imen_mtx, "imen", MTX_SPIN); +#endif mtx_lock(&Giant); /* make ldt memory segments */ @@ -2023,11 +2019,6 @@ init386(first) lidt(&r_idt); /* - * We need this mutex before the console probe. - */ - mtx_init(&clock_lock, "clk", MTX_SPIN | MTX_RECURSE); - - /* * Initialize the console before we print anything out. */ cninit(); diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c index a5b0c4a..d12ef72 100644 --- a/sys/pc98/pc98/machdep.c +++ b/sys/pc98/pc98/machdep.c @@ -173,7 +173,7 @@ sysctl_hw_physmem(SYSCTL_HANDLER_ARGS) } SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_INT|CTLFLAG_RD, - 0, 0, sysctl_hw_physmem, "I", ""); + 0, 0, sysctl_hw_physmem, "IU", ""); static int sysctl_hw_usermem(SYSCTL_HANDLER_ARGS) @@ -184,7 +184,7 @@ sysctl_hw_usermem(SYSCTL_HANDLER_ARGS) } SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_INT|CTLFLAG_RD, - 0, 0, sysctl_hw_usermem, "I", ""); + 0, 0, sysctl_hw_usermem, "IU", ""); static int sysctl_hw_availpages(SYSCTL_HANDLER_ARGS) @@ -1949,20 +1949,16 @@ init386(first) LIST_INIT(&proc0.p_contested); - mtx_init(&sched_lock, "sched lock", MTX_SPIN | MTX_RECURSE); -#ifdef SMP - /* - * Interrupts can happen very early, so initialize imen_mtx here, rather - * than in init_locks(). - */ - mtx_init(&imen_mtx, "imen", MTX_SPIN); -#endif - /* - * Giant is used early for at least debugger traps and unexpected traps. + * Initialize mutexes. */ 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_init(&clock_lock, "clk", MTX_SPIN | MTX_RECURSE); +#ifdef SMP + mtx_init(&imen_mtx, "imen", MTX_SPIN); +#endif mtx_lock(&Giant); /* make ldt memory segments */ @@ -2023,11 +2019,6 @@ init386(first) lidt(&r_idt); /* - * We need this mutex before the console probe. - */ - mtx_init(&clock_lock, "clk", MTX_SPIN | MTX_RECURSE); - - /* * Initialize the console before we print anything out. */ cninit(); |
