Synchronize with sys/i386/i386/machdep.c and microtime.s revisions
1.261 and 1.32, respectively.
This commit is contained in:
parent
47e05c0b61
commit
6fd38fbdc0
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user