diff options
| author | kato <kato@FreeBSD.org> | 2000-09-15 05:35:55 +0000 |
|---|---|---|
| committer | kato <kato@FreeBSD.org> | 2000-09-15 05:35:55 +0000 |
| commit | 0fcfd857e2c8e82e2ed0f72962477bdc915e4637 (patch) | |
| tree | b72e5c032789257d3d30b1761f04a28fe13ba8d5 | |
| parent | 829e892a2ee9371585915bd825d2f6ba541ff1c9 (diff) | |
| download | FreeBSD-src-0fcfd857e2c8e82e2ed0f72962477bdc915e4637.zip FreeBSD-src-0fcfd857e2c8e82e2ed0f72962477bdc915e4637.tar.gz | |
Merged from sys/i386/i386/machdep.c revision 1.408.
| -rw-r--r-- | sys/pc98/i386/machdep.c | 12 | ||||
| -rw-r--r-- | sys/pc98/pc98/machdep.c | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c index e785546..6baeebe 100644 --- a/sys/pc98/i386/machdep.c +++ b/sys/pc98/i386/machdep.c @@ -2250,6 +2250,12 @@ init386(first) isa_defaultirq(); #endif + /* + * Giant is used early for at least debugger traps, unexpected traps, + * and vm86bios initialization. + */ + mtx_init(&Giant, "Giant", MTX_DEF); + #ifdef DDB kdb_init(); if (boothowto & RB_KDB) @@ -2284,12 +2290,6 @@ init386(first) dblfault_tss.tss_cs = GSEL(GCODE_SEL, SEL_KPL); dblfault_tss.tss_ldt = GSEL(GLDT_SEL, SEL_KPL); - /* - * We grab Giant during the vm86bios routines, so we need to ensure - * that it is up and running before we use vm86. - */ - mtx_init(&Giant, "Giant", MTX_DEF); - vm86_initialize(); getmemsize(first); diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c index e785546..6baeebe 100644 --- a/sys/pc98/pc98/machdep.c +++ b/sys/pc98/pc98/machdep.c @@ -2250,6 +2250,12 @@ init386(first) isa_defaultirq(); #endif + /* + * Giant is used early for at least debugger traps, unexpected traps, + * and vm86bios initialization. + */ + mtx_init(&Giant, "Giant", MTX_DEF); + #ifdef DDB kdb_init(); if (boothowto & RB_KDB) @@ -2284,12 +2290,6 @@ init386(first) dblfault_tss.tss_cs = GSEL(GCODE_SEL, SEL_KPL); dblfault_tss.tss_ldt = GSEL(GLDT_SEL, SEL_KPL); - /* - * We grab Giant during the vm86bios routines, so we need to ensure - * that it is up and running before we use vm86. - */ - mtx_init(&Giant, "Giant", MTX_DEF); - vm86_initialize(); getmemsize(first); |
