From fb919e4d5a2c1baca52ac70d1064f140fffdda71 Mon Sep 17 00:00:00 2001
From: Mark Murray <markm@FreeBSD.org>
Date: Tue, 1 May 2001 08:13:21 +0000
Subject: 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)
---
 sys/gnu/ext2fs/ext2_subr.c      | 15 +++++++++------
 sys/gnu/fs/ext2fs/ext2_subr.c   | 15 +++++++++------
 sys/gnu/i386/fpemul/fpu_entry.c |  4 +++-
 3 files changed, 21 insertions(+), 13 deletions(-)

(limited to 'sys/gnu')

diff --git a/sys/gnu/ext2fs/ext2_subr.c b/sys/gnu/ext2fs/ext2_subr.c
index ee1f6219673b2..fe7c662f02d30 100644
--- a/sys/gnu/ext2fs/ext2_subr.c
+++ b/sys/gnu/ext2fs/ext2_subr.c
@@ -41,19 +41,22 @@
  */
 
 #include <sys/param.h>
-#include <gnu/ext2fs/ext2_fs_sb.h>
-#include <gnu/ext2fs/fs.h>
 
-#include <sys/lock.h>
+#include <sys/proc.h>
 #include <sys/systm.h>
-#include <sys/ucred.h>
-#include <sys/vnode.h>
-#include <gnu/ext2fs/ext2_extern.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
+#include <sys/lock.h>
+#include <sys/ucred.h>
+#include <sys/vnode.h>
+
 #include <ufs/ufs/quota.h>
 #include <ufs/ufs/inode.h>
 
+#include <gnu/ext2fs/ext2_extern.h>
+#include <gnu/ext2fs/ext2_fs_sb.h>
+#include <gnu/ext2fs/fs.h>
+
 #include "opt_ddb.h"
 
 #ifdef DDB
diff --git a/sys/gnu/fs/ext2fs/ext2_subr.c b/sys/gnu/fs/ext2fs/ext2_subr.c
index ee1f6219673b2..fe7c662f02d30 100644
--- a/sys/gnu/fs/ext2fs/ext2_subr.c
+++ b/sys/gnu/fs/ext2fs/ext2_subr.c
@@ -41,19 +41,22 @@
  */
 
 #include <sys/param.h>
-#include <gnu/ext2fs/ext2_fs_sb.h>
-#include <gnu/ext2fs/fs.h>
 
-#include <sys/lock.h>
+#include <sys/proc.h>
 #include <sys/systm.h>
-#include <sys/ucred.h>
-#include <sys/vnode.h>
-#include <gnu/ext2fs/ext2_extern.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
+#include <sys/lock.h>
+#include <sys/ucred.h>
+#include <sys/vnode.h>
+
 #include <ufs/ufs/quota.h>
 #include <ufs/ufs/inode.h>
 
+#include <gnu/ext2fs/ext2_extern.h>
+#include <gnu/ext2fs/ext2_fs_sb.h>
+#include <gnu/ext2fs/fs.h>
+
 #include "opt_ddb.h"
 
 #ifdef DDB
diff --git a/sys/gnu/i386/fpemul/fpu_entry.c b/sys/gnu/i386/fpemul/fpu_entry.c
index 3d037832dc8a8..77cee77542ad5 100644
--- a/sys/gnu/i386/fpemul/fpu_entry.c
+++ b/sys/gnu/i386/fpemul/fpu_entry.c
@@ -73,8 +73,10 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/proc.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
+#include <sys/proc.h>
 
 #include <machine/cpu.h>
 #include <machine/pcb.h>
-- 
cgit v1.3