aboutsummaryrefslogtreecommitdiff
path: root/sys/cam/ctl
diff options
context:
space:
mode:
authorConrad Meyer <cem@FreeBSD.org>2019-05-20 00:38:23 +0000
committerConrad Meyer <cem@FreeBSD.org>2019-05-20 00:38:23 +0000
commite2e050c8ef733138fc6a9e514e4b856fefbc3ff1 (patch)
treef2ba0e6ef3f572211c35dcb8f9aef4f132a08d96 /sys/cam/ctl
parent2ad7ed6e4a84448234e9aaef3c9fa884848f7387 (diff)
downloadsrc-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/cam/ctl')
-rw-r--r--sys/cam/ctl/ctl_ha.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/cam/ctl/ctl_ha.c b/sys/cam/ctl/ctl_ha.c
index b158ab232283..952bafbcf0ef 100644
--- a/sys/cam/ctl/ctl_ha.c
+++ b/sys/cam/ctl/ctl_ha.c
@@ -30,23 +30,23 @@
__FBSDID("$FreeBSD$");
#include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/condvar.h>
+#include <sys/conf.h>
+#include <sys/eventhandler.h>
#include <sys/kernel.h>
#include <sys/kthread.h>
-#include <sys/types.h>
#include <sys/limits.h>
#include <sys/lock.h>
-#include <sys/module.h>
-#include <sys/mutex.h>
-#include <sys/condvar.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
+#include <sys/module.h>
+#include <sys/mutex.h>
#include <sys/proc.h>
-#include <sys/conf.h>
#include <sys/queue.h>
-#include <sys/sysctl.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
+#include <sys/sysctl.h>
+#include <sys/systm.h>
#include <sys/uio.h>
#include <netinet/in.h>
#include <netinet/tcp.h>