From bcca5847d5e7a197302d7689cd358f5ce6316d0a Mon Sep 17 00:00:00 2001
From: markm <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/nfsclient/nfs_socket.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'sys/nfsclient/nfs_socket.c')

diff --git a/sys/nfsclient/nfs_socket.c b/sys/nfsclient/nfs_socket.c
index fefeea8..5772e4b 100644
--- a/sys/nfsclient/nfs_socket.c
+++ b/sys/nfsclient/nfs_socket.c
@@ -43,18 +43,20 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/malloc.h>
-#include <sys/mount.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
-#include <sys/vnode.h>
+#include <sys/mount.h>
+#include <sys/mutex.h>
+#include <sys/proc.h>
 #include <sys/protosw.h>
+#include <sys/signalvar.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <sys/syslog.h>
 #include <sys/sysctl.h>
-#include <sys/signalvar.h>
+#include <sys/syslog.h>
+#include <sys/vnode.h>
 
 #include <netinet/in.h>
 #include <netinet/tcp.h>
-- 
cgit v1.1