diff options
author | marcel <marcel@FreeBSD.org> | 2003-08-17 06:42:08 +0000 |
---|---|---|
committer | marcel <marcel@FreeBSD.org> | 2003-08-17 06:42:08 +0000 |
commit | 7db6a715d6d16fc45da983ae9d2f40c08e8d44a5 (patch) | |
tree | c396c4d20098d5889204513f259cb9b3a2f0c0df /sys/alpha/pci | |
parent | 93e442c71c6a2c58cc277afd732fa1984c44e238 (diff) | |
download | FreeBSD-src-7db6a715d6d16fc45da983ae9d2f40c08e8d44a5.zip FreeBSD-src-7db6a715d6d16fc45da983ae9d2f40c08e8d44a5.tar.gz |
Cleanup <machine/cpu.h> by moving MD prototypes to <machine/md_var.h>
like we have on other platforms. Move savectx() to <machine/pcb.h>.
A lot of files got these MD prototypes through the indirect inclusion
of <machine/cpu.h> and now need to include <machine/md_var.h>. The
number of which is unexpectedly large...
osf1_misc.c especially is tricky because szsigcode is redefined in
one of the osf1 header files. Reordering of the include files was
needed.
linprocfs.c now needs an explicit extern declaration.
Tested with: LINT
Diffstat (limited to 'sys/alpha/pci')
-rw-r--r-- | sys/alpha/pci/apecs.c | 8 | ||||
-rw-r--r-- | sys/alpha/pci/cia.c | 8 | ||||
-rw-r--r-- | sys/alpha/pci/irongate.c | 6 | ||||
-rw-r--r-- | sys/alpha/pci/lca.c | 6 | ||||
-rw-r--r-- | sys/alpha/pci/t2.c | 10 | ||||
-rw-r--r-- | sys/alpha/pci/tsunami.c | 6 |
6 files changed, 28 insertions, 16 deletions
diff --git a/sys/alpha/pci/apecs.c b/sys/alpha/pci/apecs.c index 3f895de..a94ac84 100644 --- a/sys/alpha/pci/apecs.c +++ b/sys/alpha/pci/apecs.c @@ -73,13 +73,15 @@ __FBSDID("$FreeBSD$"); #include <alpha/pci/apecsreg.h> #include <alpha/pci/apecsvar.h> #include <alpha/isa/isavar.h> + +#include <machine/cpuconf.h> #include <machine/intr.h> -#include <machine/resource.h> #include <machine/intrcnt.h> -#include <machine/cpuconf.h> -#include <machine/swiz.h> +#include <machine/md_var.h> +#include <machine/resource.h> #include <machine/rpb.h> #include <machine/sgmap.h> +#include <machine/swiz.h> #include <vm/vm.h> #include <vm/vm_page.h> diff --git a/sys/alpha/pci/cia.c b/sys/alpha/pci/cia.c index e3f0615..962ac65 100644 --- a/sys/alpha/pci/cia.c +++ b/sys/alpha/pci/cia.c @@ -107,14 +107,16 @@ __FBSDID("$FreeBSD$"); #include <alpha/pci/ciareg.h> #include <alpha/pci/ciavar.h> #include <alpha/isa/isavar.h> + #include <machine/bwx.h> -#include <machine/swiz.h> +#include <machine/cpuconf.h> #include <machine/intr.h> #include <machine/intrcnt.h> -#include <machine/cpuconf.h> -#include <machine/rpb.h> +#include <machine/md_var.h> #include <machine/resource.h> +#include <machine/rpb.h> #include <machine/sgmap.h> +#include <machine/swiz.h> #include <vm/vm.h> #include <vm/vm_page.h> diff --git a/sys/alpha/pci/irongate.c b/sys/alpha/pci/irongate.c index 017e6f9..ea314cb 100644 --- a/sys/alpha/pci/irongate.c +++ b/sys/alpha/pci/irongate.c @@ -43,12 +43,14 @@ __FBSDID("$FreeBSD$"); #include <alpha/isa/isavar.h> #include <alpha/pci/irongatereg.h> #include <alpha/pci/irongatevar.h> + #include <machine/bwx.h> +#include <machine/cpuconf.h> #include <machine/intr.h> #include <machine/intrcnt.h> -#include <machine/cpuconf.h> -#include <machine/rpb.h> +#include <machine/md_var.h> #include <machine/resource.h> +#include <machine/rpb.h> #include <machine/sgmap.h> #include <vm/vm.h> diff --git a/sys/alpha/pci/lca.c b/sys/alpha/pci/lca.c index 548881e..b00cadb 100644 --- a/sys/alpha/pci/lca.c +++ b/sys/alpha/pci/lca.c @@ -39,10 +39,12 @@ __FBSDID("$FreeBSD$"); #include <alpha/pci/lcareg.h> #include <alpha/pci/lcavar.h> #include <alpha/isa/isavar.h> -#include <machine/intr.h> + #include <machine/cpuconf.h> -#include <machine/swiz.h> +#include <machine/intr.h> +#include <machine/md_var.h> #include <machine/sgmap.h> +#include <machine/swiz.h> #include <vm/vm.h> #include <vm/vm_page.h> diff --git a/sys/alpha/pci/t2.c b/sys/alpha/pci/t2.c index c3f0f19..8db8a71 100644 --- a/sys/alpha/pci/t2.c +++ b/sys/alpha/pci/t2.c @@ -66,16 +66,18 @@ __FBSDID("$FreeBSD$"); #include <sys/rman.h> #include <sys/interrupt.h> +#include <pci/pcivar.h> #include <alpha/pci/t2reg.h> #include <alpha/pci/t2var.h> #include <alpha/isa/isavar.h> + +#include <machine/cpuconf.h> #include <machine/intr.h> -#include <machine/resource.h> #include <machine/intrcnt.h> -#include <machine/cpuconf.h> -#include <machine/swiz.h> +#include <machine/md_var.h> +#include <machine/resource.h> #include <machine/sgmap.h> -#include <pci/pcivar.h> +#include <machine/swiz.h> #include <vm/vm.h> #include <vm/vm_page.h> diff --git a/sys/alpha/pci/tsunami.c b/sys/alpha/pci/tsunami.c index 6e43d8d..29e7718 100644 --- a/sys/alpha/pci/tsunami.c +++ b/sys/alpha/pci/tsunami.c @@ -46,12 +46,14 @@ __FBSDID("$FreeBSD$"); #include <alpha/isa/isavar.h> #include <alpha/pci/tsunamireg.h> #include <alpha/pci/tsunamivar.h> + #include <machine/bwx.h> +#include <machine/cpuconf.h> #include <machine/intr.h> #include <machine/intrcnt.h> -#include <machine/cpuconf.h> -#include <machine/rpb.h> +#include <machine/md_var.h> #include <machine/resource.h> +#include <machine/rpb.h> #include <machine/sgmap.h> #include <vm/vm.h> |