mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-15 10:17:20 +00:00
Synchronize with sys/i386/isa/npx.c and clock.c revisions 1.53 and
1.103, respectively.
This commit is contained in:
parent
47d57b2340
commit
016f33ea47
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=30811
@ -34,7 +34,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91
|
||||
* $Id: clock.c,v 1.34 1997/08/30 15:47:46 kato Exp $
|
||||
* $Id: clock.c,v 1.35 1997/09/01 10:44:06 kato Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -65,10 +65,13 @@
|
||||
#ifdef CLK_CALIBRATION_LOOP
|
||||
#include <machine/cons.h>
|
||||
#endif
|
||||
#include <machine/cpu.h>
|
||||
#include <machine/cputypes.h>
|
||||
#include <machine/frame.h>
|
||||
#include <machine/ipl.h>
|
||||
#include <machine/limits.h>
|
||||
#ifdef APIC_IO
|
||||
#include <machine/segments.h>
|
||||
#endif
|
||||
#if defined(SMP) || defined(APIC_IO)
|
||||
#include <machine/smp.h>
|
||||
#endif /* SMP || APIC_IO */
|
||||
|
@ -34,7 +34,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91
|
||||
* $Id: clock.c,v 1.34 1997/08/30 15:47:46 kato Exp $
|
||||
* $Id: clock.c,v 1.35 1997/09/01 10:44:06 kato Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -65,10 +65,13 @@
|
||||
#ifdef CLK_CALIBRATION_LOOP
|
||||
#include <machine/cons.h>
|
||||
#endif
|
||||
#include <machine/cpu.h>
|
||||
#include <machine/cputypes.h>
|
||||
#include <machine/frame.h>
|
||||
#include <machine/ipl.h>
|
||||
#include <machine/limits.h>
|
||||
#ifdef APIC_IO
|
||||
#include <machine/segments.h>
|
||||
#endif
|
||||
#if defined(SMP) || defined(APIC_IO)
|
||||
#include <machine/smp.h>
|
||||
#endif /* SMP || APIC_IO */
|
||||
|
@ -34,7 +34,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91
|
||||
* $Id: clock.c,v 1.34 1997/08/30 15:47:46 kato Exp $
|
||||
* $Id: clock.c,v 1.35 1997/09/01 10:44:06 kato Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -65,10 +65,13 @@
|
||||
#ifdef CLK_CALIBRATION_LOOP
|
||||
#include <machine/cons.h>
|
||||
#endif
|
||||
#include <machine/cpu.h>
|
||||
#include <machine/cputypes.h>
|
||||
#include <machine/frame.h>
|
||||
#include <machine/ipl.h>
|
||||
#include <machine/limits.h>
|
||||
#ifdef APIC_IO
|
||||
#include <machine/segments.h>
|
||||
#endif
|
||||
#if defined(SMP) || defined(APIC_IO)
|
||||
#include <machine/smp.h>
|
||||
#endif /* SMP || APIC_IO */
|
||||
|
@ -32,7 +32,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)npx.c 7.2 (Berkeley) 5/12/91
|
||||
* $Id: npx.c,v 1.26 1997/08/18 11:30:05 kato Exp $
|
||||
* $Id: npx.c,v 1.27 1997/08/21 10:13:12 kato Exp $
|
||||
*/
|
||||
|
||||
#include "npx.h"
|
||||
@ -53,12 +53,15 @@
|
||||
#include <sys/signalvar.h>
|
||||
|
||||
#include <machine/asmacros.h>
|
||||
#include <machine/cpu.h>
|
||||
#include <machine/cputypes.h>
|
||||
#include <machine/frame.h>
|
||||
#include <machine/ipl.h>
|
||||
#include <machine/md_var.h>
|
||||
#include <machine/pcb.h>
|
||||
#include <machine/psl.h>
|
||||
#include <machine/clock.h>
|
||||
#include <machine/specialreg.h>
|
||||
#include <machine/segments.h>
|
||||
|
||||
#include <i386/isa/icu.h>
|
||||
#include <i386/isa/isa_device.h>
|
||||
|
Loading…
Reference in New Issue
Block a user