diff options
| author | markm <markm@FreeBSD.org> | 2001-05-01 08:13:21 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 2001-05-01 08:13:21 +0000 |
| commit | bcca5847d5e7a197302d7689cd358f5ce6316d0a (patch) | |
| tree | a1f5dea8640fa8bdeebec40477b6fdcf33b3e51b /sys/isa | |
| parent | 7d3d350edce373e3ec1e8e7fe7d94bb08d031a24 (diff) | |
| download | FreeBSD-src-bcca5847d5e7a197302d7689cd358f5ce6316d0a.zip FreeBSD-src-bcca5847d5e7a197302d7689cd358f5ce6316d0a.tar.gz | |
Undo part of the tangle of having sys/lock.h and sys/mutex.h included in
other "system" header files.
Also help the deprecation of lockmgr.h by making it a sub-include of
sys/lock.h and removing sys/lockmgr.h form kernel .c files.
Sort sys/*.h includes where possible in affected files.
OK'ed by: bde (with reservations)
Diffstat (limited to 'sys/isa')
| -rw-r--r-- | sys/isa/fd.c | 6 | ||||
| -rw-r--r-- | sys/isa/sio.c | 18 |
2 files changed, 14 insertions, 10 deletions
diff --git a/sys/isa/fd.c b/sys/isa/fd.c index 4b7789b..285aed8 100644 --- a/sys/isa/fd.c +++ b/sys/isa/fd.c @@ -56,15 +56,17 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/bio.h> #include <sys/bus.h> #include <sys/conf.h> -#include <sys/disklabel.h> #include <sys/devicestat.h> +#include <sys/disklabel.h> #include <sys/fcntl.h> +#include <sys/kernel.h> +#include <sys/lock.h> #include <sys/malloc.h> #include <sys/module.h> +#include <sys/mutex.h> #include <sys/proc.h> #include <sys/syslog.h> diff --git a/sys/isa/sio.c b/sys/isa/sio.c index d1a876b..ab9cf09 100644 --- a/sys/isa/sio.c +++ b/sys/isa/sio.c @@ -52,22 +52,24 @@ * - Added PC-Card driver table and handlers */ #include <sys/param.h> -#include <sys/bus.h> #include <sys/systm.h> -#include <sys/reboot.h> -#include <sys/malloc.h> -#include <sys/tty.h> -#include <sys/proc.h> -#include <sys/module.h> +#include <sys/bus.h> +#include <sys/bus.h> #include <sys/conf.h> #include <sys/dkstat.h> #include <sys/fcntl.h> #include <sys/interrupt.h> #include <sys/ipl.h> #include <sys/kernel.h> -#include <sys/syslog.h> +#include <sys/lock.h> +#include <sys/malloc.h> +#include <sys/module.h> +#include <sys/mutex.h> +#include <sys/proc.h> +#include <sys/reboot.h> #include <sys/sysctl.h> -#include <sys/bus.h> +#include <sys/syslog.h> +#include <sys/tty.h> #include <machine/bus_pio.h> #include <machine/bus.h> #include <sys/rman.h> |
