diff options
| author | kato <kato@FreeBSD.org> | 1997-09-03 12:41:16 +0000 |
|---|---|---|
| committer | kato <kato@FreeBSD.org> | 1997-09-03 12:41:16 +0000 |
| commit | 74946fb3957410d959ad35881298263085ca794d (patch) | |
| tree | 73ddaaf4fc025af733fa62b22018918fff5fd587 /sys/pc98 | |
| parent | dcc6d309b2fe8b67918d058d54dca87d0daeb818 (diff) | |
| download | FreeBSD-src-74946fb3957410d959ad35881298263085ca794d.zip FreeBSD-src-74946fb3957410d959ad35881298263085ca794d.tar.gz | |
Synchronize with sys/i386/i386/machdep.c and microtime.s revisions
1.261 and 1.32, respectively.
Diffstat (limited to 'sys/pc98')
| -rw-r--r-- | sys/pc98/i386/machdep.c | 4 | ||||
| -rw-r--r-- | sys/pc98/i386/microtime.s | 3 | ||||
| -rw-r--r-- | sys/pc98/pc98/machdep.c | 4 |
3 files changed, 3 insertions, 8 deletions
diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c index 9235f19..3da629f 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.53 1997/08/27 08:43:18 kato Exp $ + * $Id: machdep.c,v 1.54 1997/09/01 10:42:03 kato Exp $ */ #include "apm.h" @@ -100,13 +100,11 @@ #endif #include <machine/cpu.h> #include <machine/reg.h> -#include <machine/psl.h> #include <machine/clock.h> #include <machine/specialreg.h> #include <machine/cons.h> #include <machine/bootinfo.h> #include <machine/md_var.h> -#include <machine/pcb_ext.h> #ifdef SMP #include <machine/smp.h> #endif diff --git a/sys/pc98/i386/microtime.s b/sys/pc98/i386/microtime.s index 4dac476..f1ac0e1 100644 --- a/sys/pc98/i386/microtime.s +++ b/sys/pc98/i386/microtime.s @@ -32,13 +32,12 @@ * SUCH DAMAGE. * * from: Steve McCanne's microtime code - * $Id: microtime.s,v 1.14 1997/08/24 11:09:36 kato Exp $ + * $Id: microtime.s,v 1.15 1997/09/01 10:42:43 kato Exp $ */ #include "opt_cpu.h" #include <machine/asmacros.h> -#include <machine/param.h> #include <i386/isa/icu.h> #ifdef PC98 diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c index 9235f19..3da629f 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.53 1997/08/27 08:43:18 kato Exp $ + * $Id: machdep.c,v 1.54 1997/09/01 10:42:03 kato Exp $ */ #include "apm.h" @@ -100,13 +100,11 @@ #endif #include <machine/cpu.h> #include <machine/reg.h> -#include <machine/psl.h> #include <machine/clock.h> #include <machine/specialreg.h> #include <machine/cons.h> #include <machine/bootinfo.h> #include <machine/md_var.h> -#include <machine/pcb_ext.h> #ifdef SMP #include <machine/smp.h> #endif |
