summaryrefslogtreecommitdiffstats
path: root/sys/i386/ibcs2/ibcs2_misc.c
diff options
context:
space:
mode:
authormarkm <markm@FreeBSD.org>2001-05-01 08:13:21 +0000
committermarkm <markm@FreeBSD.org>2001-05-01 08:13:21 +0000
commitbcca5847d5e7a197302d7689cd358f5ce6316d0a (patch)
treea1f5dea8640fa8bdeebec40477b6fdcf33b3e51b /sys/i386/ibcs2/ibcs2_misc.c
parent7d3d350edce373e3ec1e8e7fe7d94bb08d031a24 (diff)
downloadFreeBSD-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/i386/ibcs2/ibcs2_misc.c')
-rw-r--r--sys/i386/ibcs2/ibcs2_misc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/i386/ibcs2/ibcs2_misc.c b/sys/i386/ibcs2/ibcs2_misc.c
index b53788f..6f8d7e7 100644
--- a/sys/i386/ibcs2/ibcs2_misc.c
+++ b/sys/i386/ibcs2/ibcs2_misc.c
@@ -55,19 +55,20 @@
* handled here.
*/
#include <sys/param.h>
+#include <sys/systm.h>
#include <sys/dirent.h>
#include <sys/fcntl.h>
-#include <sys/file.h>
#include <sys/filedesc.h>
#include <sys/kernel.h>
#include <sys/lock.h>
#include <sys/malloc.h>
+#include <sys/file.h> /* Must come after sys/malloc.h */
+#include <sys/mutex.h>
#include <sys/reboot.h>
#include <sys/resourcevar.h>
#include <sys/stat.h>
#include <sys/sysctl.h>
#include <sys/sysproto.h>
-#include <sys/systm.h>
#include <sys/time.h>
#include <sys/times.h>
#include <sys/vnode.h>
OpenPOWER on IntegriCloud