diff options
| author | bde <bde@FreeBSD.org> | 1997-10-28 11:43:57 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1997-10-28 11:43:57 +0000 |
| commit | 561cc79f5093268af954eefbb941f99824e15be4 (patch) | |
| tree | 1ce3e367848ae19f363ddefb9175eb769538fec7 /sys/i386/isa | |
| parent | c2c827e04f2282df60ba15e573159b3c7c0968b1 (diff) | |
| download | FreeBSD-src-561cc79f5093268af954eefbb941f99824e15be4.zip FreeBSD-src-561cc79f5093268af954eefbb941f99824e15be4.tar.gz | |
Don't include <machine/cputypes.h> or declare cputype/class interfaces
in <machine/cpu.h>. Moved the declarations to <machine/cputypes.h>.
Fixed style bugs in the moved code. Fixed everything that depended on
the nested include. Don't include <machine/cpu.h> (in the changed files)
unless something in it is used directly.
Diffstat (limited to 'sys/i386/isa')
| -rw-r--r-- | sys/i386/isa/clock.c | 7 | ||||
| -rw-r--r-- | sys/i386/isa/npx.c | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c index e812a20..b8ad0c1 100644 --- a/sys/i386/isa/clock.c +++ b/sys/i386/isa/clock.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.12 1997/09/01 07:37:01 smp Exp smp $ + * $Id: clock.c,v 1.102 1997/09/01 07:45:23 fsmp Exp $ */ /* @@ -61,10 +61,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 */ diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c index 8e2416d..1b2fd6f 100644 --- a/sys/i386/isa/npx.c +++ b/sys/i386/isa/npx.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)npx.c 7.2 (Berkeley) 5/12/91 - * $Id: npx.c,v 1.51 1997/08/18 06:58:44 charnier Exp $ + * $Id: npx.c,v 1.52 1997/08/21 06:32:58 charnier 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> |
