Synchronize with following changes:

>  Revision  Changes    Path
>   1.97      +2 -1      src/sys/i386/i386/trap.c
>   1.86      +2 -1      src/sys/i386/isa/clock.c
>   1.88      +2 -1      src/sys/i386/isa/isa.c
>   1.44      +3 -2      src/sys/i386/isa/npx.c
This commit is contained in:
KATO Takenori 1997-05-31 12:43:17 +00:00
parent 4e97ca1849
commit 1ed2d1f6da
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=26318
6 changed files with 13 additions and 7 deletions

View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91
* $Id: clock.c,v 1.22 1997/05/28 09:04:26 kato Exp $
* $Id: clock.c,v 1.23 1997/05/30 09:57:08 kato Exp $
*/
/*
@ -67,6 +67,7 @@
#endif
#include <machine/cpu.h>
#include <machine/frame.h>
#include <machine/ipl.h>
#include <i386/isa/icu.h>
#ifdef PC98

View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91
* $Id: clock.c,v 1.22 1997/05/28 09:04:26 kato Exp $
* $Id: clock.c,v 1.23 1997/05/30 09:57:08 kato Exp $
*/
/*
@ -67,6 +67,7 @@
#endif
#include <machine/cpu.h>
#include <machine/frame.h>
#include <machine/ipl.h>
#include <i386/isa/icu.h>
#ifdef PC98

View File

@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)trap.c 7.4 (Berkeley) 5/13/91
* $Id: trap.c,v 1.20 1997/05/08 09:31:08 kato Exp $
* $Id: trap.c,v 1.21 1997/05/30 09:59:11 kato Exp $
*/
/*
@ -71,6 +71,7 @@
#include <sys/user.h>
#include <machine/cpu.h>
#include <machine/ipl.h>
#include <machine/md_var.h>
#include <machine/psl.h>
#include <machine/reg.h>

View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91
* $Id: clock.c,v 1.22 1997/05/28 09:04:26 kato Exp $
* $Id: clock.c,v 1.23 1997/05/30 09:57:08 kato Exp $
*/
/*
@ -67,6 +67,7 @@
#endif
#include <machine/cpu.h>
#include <machine/frame.h>
#include <machine/ipl.h>
#include <i386/isa/icu.h>
#ifdef PC98

View File

@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* from: @(#)npx.c 7.2 (Berkeley) 5/12/91
* $Id: npx.c,v 1.17 1997/04/27 13:22:08 kato Exp $
* $Id: npx.c,v 1.18 1997/05/08 09:19:56 kato Exp $
*/
#include "npx.h"
@ -56,8 +56,9 @@
#include <machine/asmacros.h>
#include <machine/cpu.h>
#include <machine/pcb.h>
#include <machine/ipl.h>
#include <machine/md_var.h>
#include <machine/pcb.h>
#include <machine/trap.h>
#include <machine/clock.h>
#include <machine/specialreg.h>

View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
* $Id: pc98.c,v 1.27 1997/05/28 09:18:23 kato Exp $
* $Id: pc98.c,v 1.28 1997/05/30 10:05:56 kato Exp $
*/
/*
@ -59,6 +59,7 @@
#include <sys/buf.h>
#include <sys/syslog.h>
#include <sys/malloc.h>
#include <machine/ipl.h>
#include <machine/md_var.h>
#include <machine/segments.h>
#if defined(APIC_IO)