Merged from sys/i386/i386/machdep.c revision 1.415.
This commit is contained in:
parent
21ee02a86a
commit
9d733009ab
@ -2180,7 +2180,6 @@ init386(first)
|
|||||||
|
|
||||||
/* setup curproc so that mutexes work */
|
/* setup curproc so that mutexes work */
|
||||||
PCPU_SET(curproc, &proc0);
|
PCPU_SET(curproc, &proc0);
|
||||||
PCPU_SET(prevproc, &proc0);
|
|
||||||
|
|
||||||
/* make ldt memory segments */
|
/* make ldt memory segments */
|
||||||
/*
|
/*
|
||||||
@ -2241,6 +2240,11 @@ init386(first)
|
|||||||
r_idt.rd_base = (int) idt;
|
r_idt.rd_base = (int) idt;
|
||||||
lidt(&r_idt);
|
lidt(&r_idt);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* We need this mutex before the console probe.
|
||||||
|
*/
|
||||||
|
mtx_init(&clock_lock, "clk interrupt lock", MTX_SPIN);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Initialize the console before we print anything out.
|
* Initialize the console before we print anything out.
|
||||||
*/
|
*/
|
||||||
@ -2252,8 +2256,7 @@ init386(first)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Giant is used early for at least debugger traps, unexpected traps,
|
* Giant is used early for at least debugger traps and unexpected traps.
|
||||||
* and vm86bios initialization.
|
|
||||||
*/
|
*/
|
||||||
mtx_init(&Giant, "Giant", MTX_DEF);
|
mtx_init(&Giant, "Giant", MTX_DEF);
|
||||||
|
|
||||||
|
@ -2180,7 +2180,6 @@ init386(first)
|
|||||||
|
|
||||||
/* setup curproc so that mutexes work */
|
/* setup curproc so that mutexes work */
|
||||||
PCPU_SET(curproc, &proc0);
|
PCPU_SET(curproc, &proc0);
|
||||||
PCPU_SET(prevproc, &proc0);
|
|
||||||
|
|
||||||
/* make ldt memory segments */
|
/* make ldt memory segments */
|
||||||
/*
|
/*
|
||||||
@ -2241,6 +2240,11 @@ init386(first)
|
|||||||
r_idt.rd_base = (int) idt;
|
r_idt.rd_base = (int) idt;
|
||||||
lidt(&r_idt);
|
lidt(&r_idt);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* We need this mutex before the console probe.
|
||||||
|
*/
|
||||||
|
mtx_init(&clock_lock, "clk interrupt lock", MTX_SPIN);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Initialize the console before we print anything out.
|
* Initialize the console before we print anything out.
|
||||||
*/
|
*/
|
||||||
@ -2252,8 +2256,7 @@ init386(first)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Giant is used early for at least debugger traps, unexpected traps,
|
* Giant is used early for at least debugger traps and unexpected traps.
|
||||||
* and vm86bios initialization.
|
|
||||||
*/
|
*/
|
||||||
mtx_init(&Giant, "Giant", MTX_DEF);
|
mtx_init(&Giant, "Giant", MTX_DEF);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user