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/kern/link_elf_obj.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'sys/kern/link_elf_obj.c')

diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c
index 8327794..344f163 100644
--- a/sys/kern/link_elf_obj.c
+++ b/sys/kern/link_elf_obj.c
@@ -29,19 +29,20 @@
 #include "opt_ddb.h"
 
 #include <sys/param.h>
-#include <sys/kernel.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/namei.h>
 #include <sys/fcntl.h>
 #include <sys/vnode.h>
 #include <sys/linker.h>
+
 #include <machine/elf.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
-#include <sys/lock.h>
 #ifdef SPARSE_MAPPING
 #include <vm/vm_object.h>
 #include <vm/vm_kern.h>
@@ -49,6 +50,7 @@
 #endif
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
+
 #ifdef __AOUT__
 #include <nlist.h>
 #endif
-- 
cgit v1.1