diff options
author | Conrad Meyer <cem@FreeBSD.org> | 2019-05-20 00:38:23 +0000 |
---|---|---|
committer | Conrad Meyer <cem@FreeBSD.org> | 2019-05-20 00:38:23 +0000 |
commit | e2e050c8ef733138fc6a9e514e4b856fefbc3ff1 (patch) | |
tree | f2ba0e6ef3f572211c35dcb8f9aef4f132a08d96 /sys/dev/firewire | |
parent | 2ad7ed6e4a84448234e9aaef3c9fa884848f7387 (diff) | |
download | src-e2e050c8ef733138fc6a9e514e4b856fefbc3ff1.tar.gz src-e2e050c8ef733138fc6a9e514e4b856fefbc3ff1.zip |
Extract eventfilter declarations to sys/_eventfilter.h
This allows replacing "sys/eventfilter.h" includes with "sys/_eventfilter.h"
in other header files (e.g., sys/{bus,conf,cpu}.h) and reduces header
pollution substantially.
EVENTHANDLER_DECLARE and EVENTHANDLER_LIST_DECLAREs were moved out of .c
files into appropriate headers (e.g., sys/proc.h, powernv/opal.h).
As a side effect of reduced header pollution, many .c files and headers no
longer contain needed definitions. The remainder of the patch addresses
adding appropriate includes to fix those files.
LOCK_DEBUG and LOCK_FILE_LINE_ARG are moved to sys/_lock.h, as required by
sys/mutex.h since r326106 (but silently protected by header pollution prior
to this change).
No functional change (intended). Of course, any out of tree modules that
relied on header pollution for sys/eventhandler.h, sys/lock.h, or
sys/mutex.h inclusion need to be fixed. __FreeBSD_version has been bumped.
Notes
Notes:
svn path=/head/; revision=347984
Diffstat (limited to 'sys/dev/firewire')
-rw-r--r-- | sys/dev/firewire/firewire.c | 11 | ||||
-rw-r--r-- | sys/dev/firewire/fwohci.c | 1 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/firewire/firewire.c b/sys/dev/firewire/firewire.c index 3798188fdcb1..5e8cb3b83273 100644 --- a/sys/dev/firewire/firewire.c +++ b/sys/dev/firewire/firewire.c @@ -38,16 +38,15 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <sys/systm.h> -#include <sys/types.h> - +#include <sys/conf.h> +#include <sys/eventhandler.h> #include <sys/jail.h> #include <sys/kernel.h> -#include <sys/module.h> +#include <sys/kthread.h> #include <sys/malloc.h> -#include <sys/conf.h> +#include <sys/module.h> #include <sys/sysctl.h> -#include <sys/kthread.h> +#include <sys/systm.h> #include <sys/kdb.h> #include <sys/bus.h> /* used by smbus and newbus */ diff --git a/sys/dev/firewire/fwohci.c b/sys/dev/firewire/fwohci.c index 03df023b7531..30eca83900e7 100644 --- a/sys/dev/firewire/fwohci.c +++ b/sys/dev/firewire/fwohci.c @@ -39,6 +39,7 @@ #include <sys/param.h> #include <sys/systm.h> +#include <sys/lock.h> #include <sys/mbuf.h> #include <sys/malloc.h> #include <sys/sockio.h> |