From 8532a0ba597285091e231d6f9f80e92270835803 Mon Sep 17 00:00:00 2001 From: KATO Takenori Date: Mon, 1 Sep 1997 10:42:03 +0000 Subject: [PATCH] Synchronize with sys/i386/i386/machdep.c revision 1.260. --- sys/pc98/i386/machdep.c | 7 +++++-- sys/pc98/pc98/machdep.c | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c index d6e4a972ca76..9235f19c6c08 100644 --- a/sys/pc98/i386/machdep.c +++ b/sys/pc98/i386/machdep.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $Id: machdep.c,v 1.52 1997/08/21 10:12:42 kato Exp $ + * $Id: machdep.c,v 1.53 1997/08/27 08:43:18 kato Exp $ */ #include "apm.h" @@ -43,7 +43,7 @@ #include "opt_sysvipc.h" #include "opt_ddb.h" #include "opt_bounce.h" -#include "opt_machdep.h" +#include "opt_maxmem.h" #include "opt_perfmon.h" #include "opt_smp.h" #include "opt_userconfig.h" @@ -858,6 +858,9 @@ struct region_descriptor r_gdt, r_idt; #ifdef SMP extern struct i386tss common_tss; /* One tss per cpu */ +#ifdef VM86 +extern struct segment_descriptor common_tssd; +#endif /* VM86 */ #else struct i386tss common_tss; #ifdef VM86 diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c index d6e4a972ca76..9235f19c6c08 100644 --- a/sys/pc98/pc98/machdep.c +++ b/sys/pc98/pc98/machdep.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $Id: machdep.c,v 1.52 1997/08/21 10:12:42 kato Exp $ + * $Id: machdep.c,v 1.53 1997/08/27 08:43:18 kato Exp $ */ #include "apm.h" @@ -43,7 +43,7 @@ #include "opt_sysvipc.h" #include "opt_ddb.h" #include "opt_bounce.h" -#include "opt_machdep.h" +#include "opt_maxmem.h" #include "opt_perfmon.h" #include "opt_smp.h" #include "opt_userconfig.h" @@ -858,6 +858,9 @@ struct region_descriptor r_gdt, r_idt; #ifdef SMP extern struct i386tss common_tss; /* One tss per cpu */ +#ifdef VM86 +extern struct segment_descriptor common_tssd; +#endif /* VM86 */ #else struct i386tss common_tss; #ifdef VM86