From f406e2febe096c3ad6326887ac7e003db227cc61 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Sat, 22 Oct 2011 11:27:10 +0200
Subject: [PATCH] Remove some duplicate includes in sys/kern.

---
 sys/kern/imgact_resident.c  | 3 ---
 sys/kern/kern_checkpoint.c  | 1 -
 sys/kern/kern_descrip.c     | 1 -
 sys/kern/kern_device.c      | 5 +----
 sys/kern/kern_environment.c | 2 --
 sys/kern/kern_fp.c          | 1 -
 sys/kern/kern_intr.c        | 2 --
 sys/kern/kern_shutdown.c    | 2 --
 sys/kern/kern_sig.c         | 1 -
 sys/kern/kern_time.c        | 2 --
 sys/kern/kern_umtx.c        | 3 ---
 sys/kern/kern_upcall.c      | 3 ---
 sys/kern/kern_wdog.c        | 1 -
 sys/kern/subr_disk.c        | 2 --
 sys/kern/subr_disklabel32.c | 2 --
 sys/kern/subr_diskmbr.c     | 2 --
 sys/kern/uipc_socket.c      | 2 --
 sys/kern/vfs_bio.c          | 2 --
 18 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/sys/kern/imgact_resident.c b/sys/kern/imgact_resident.c
index e9297fbb27..b573faf640 100644
--- a/sys/kern/imgact_resident.c
+++ b/sys/kern/imgact_resident.c
@@ -32,8 +32,6 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
- * $DragonFly: src/sys/kern/imgact_resident.c,v 1.17 2007/04/30 07:18:53 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -48,7 +46,6 @@
 #include <sys/priv.h>
 #include <sys/resourcevar.h>
 #include <sys/sysent.h>
-#include <sys/systm.h>
 #include <sys/stat.h>
 #include <sys/vnode.h>
 #include <sys/inflate.h>
diff --git a/sys/kern/kern_checkpoint.c b/sys/kern/kern_checkpoint.c
index a77bfa23eb..3b604922bd 100644
--- a/sys/kern/kern_checkpoint.c
+++ b/sys/kern/kern_checkpoint.c
@@ -46,7 +46,6 @@
 #include <vm/vm_map.h>
 #include <vm/vm_extern.h>
 #include <sys/mman.h>
-#include <sys/sysent.h>
 #include <sys/sysproto.h>
 #include <sys/resource.h>
 #include <sys/resourcevar.h>
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index b0c43bac53..93aebb8ea9 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -86,7 +86,6 @@
 #include <sys/vnode.h>
 #include <sys/proc.h>
 #include <sys/nlookup.h>
-#include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/filio.h>
 #include <sys/fcntl.h>
diff --git a/sys/kern/kern_device.c b/sys/kern/kern_device.c
index b888ff835e..5de7ecbcd9 100644
--- a/sys/kern/kern_device.c
+++ b/sys/kern/kern_device.c
@@ -26,14 +26,12 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $DragonFly: src/sys/kern/kern_device.c,v 1.27 2007/07/23 18:59:50 dillon Exp $
  */
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
-#include <sys/systm.h>
 #include <sys/module.h>
 #include <sys/malloc.h>
 #include <sys/conf.h>
@@ -45,7 +43,6 @@
 #include <sys/tree.h>
 #include <sys/syslink_rpc.h>
 #include <sys/proc.h>
-#include <sys/sysctl.h>
 #include <machine/stdarg.h>
 #include <sys/devfs.h>
 #include <sys/dsched.h>
diff --git a/sys/kern/kern_environment.c b/sys/kern/kern_environment.c
index 64c614bf67..abda37db19 100644
--- a/sys/kern/kern_environment.c
+++ b/sys/kern/kern_environment.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/kern/kern_environment.c,v 1.10.2.7 2002/05/07 09:57:16 bde Exp $
- * $DragonFly: src/sys/kern/kern_environment.c,v 1.7 2008/07/23 16:39:28 dillon Exp $
  */
 
 /*
@@ -50,7 +49,6 @@
 #include <sys/spinlock2.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
-#include <sys/libkern.h>
 
 /* exported variables */
 char		*kern_envp;		/* <sys/systm.h> */
diff --git a/sys/kern/kern_fp.c b/sys/kern/kern_fp.c
index 68466ef614..710c62d316 100644
--- a/sys/kern/kern_fp.c
+++ b/sys/kern/kern_fp.c
@@ -73,7 +73,6 @@
 #include <vm/vm_pager.h>
 #include <vm/vm_pageout.h>
 #include <vm/vm_extern.h>
-#include <vm/vm_page.h>
 #include <vm/vm_kern.h>
 
 #include <sys/file2.h>
diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c
index 5057baed09..8a1383f841 100644
--- a/sys/kern/kern_intr.c
+++ b/sys/kern/kern_intr.c
@@ -42,8 +42,6 @@
 
 #include <machine/frame.h>
 
-#include <sys/interrupt.h>
-
 #include <sys/thread2.h>
 #include <sys/mplock2.h>
 
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
index 39a214bbe4..faf5ae9985 100644
--- a/sys/kern/kern_shutdown.c
+++ b/sys/kern/kern_shutdown.c
@@ -37,7 +37,6 @@
  *
  *	@(#)kern_shutdown.c	8.3 (Berkeley) 1/21/94
  * $FreeBSD: src/sys/kern/kern_shutdown.c,v 1.72.2.12 2002/02/21 19:15:10 dillon Exp $
- * $DragonFly: src/sys/kern/kern_shutdown.c,v 1.62 2008/01/05 13:23:48 corecode Exp $
  */
 
 #include "opt_ddb.h"
@@ -72,7 +71,6 @@
 #include <sys/device.h>
 #include <sys/cons.h>
 #include <sys/shm.h>
-#include <sys/kerneldump.h>
 #include <sys/kern_syscall.h>
 #include <vm/vm_map.h>
 #include <vm/pmap.h>
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index 61236b8a5e..b1c1c5efbd 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -52,7 +52,6 @@
 #include <sys/proc.h>
 #include <sys/nlookup.h>
 #include <sys/pioctl.h>
-#include <sys/systm.h>
 #include <sys/acct.h>
 #include <sys/fcntl.h>
 #include <sys/lock.h>
diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c
index ae4d9383fc..617eb13253 100644
--- a/sys/kern/kern_time.c
+++ b/sys/kern/kern_time.c
@@ -32,7 +32,6 @@
  *
  *	@(#)kern_time.c	8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/sys/kern/kern_time.c,v 1.68.2.1 2002/10/01 08:00:41 bde Exp $
- * $DragonFly: src/sys/kern/kern_time.c,v 1.40 2008/04/02 14:16:16 sephe Exp $
  */
 
 #include <sys/param.h>
@@ -42,7 +41,6 @@
 #include <sys/resourcevar.h>
 #include <sys/signalvar.h>
 #include <sys/kernel.h>
-#include <sys/systm.h>
 #include <sys/sysent.h>
 #include <sys/sysunion.h>
 #include <sys/proc.h>
diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c
index 869db8eae4..6820d16242 100644
--- a/sys/kern/kern_umtx.c
+++ b/sys/kern/kern_umtx.c
@@ -32,8 +32,6 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
- * $DragonFly: src/sys/kern/kern_umtx.c,v 1.9 2008/05/09 07:24:45 dillon Exp $
  */
 
 /*
@@ -63,7 +61,6 @@
 #include <vm/vm_pager.h>
 #include <vm/vm_pageout.h>
 #include <vm/vm_extern.h>
-#include <vm/vm_page.h>
 #include <vm/vm_kern.h>
 
 #include <vm/vm_page2.h>
diff --git a/sys/kern/kern_upcall.c b/sys/kern/kern_upcall.c
index 736c6d6ebd..ee53a25a90 100644
--- a/sys/kern/kern_upcall.c
+++ b/sys/kern/kern_upcall.c
@@ -30,8 +30,6 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
- * $DragonFly: src/sys/kern/kern_upcall.c,v 1.11 2006/09/10 21:35:10 dillon Exp $
  */
 
 /*
@@ -44,7 +42,6 @@
 #include <sys/proc.h>
 #include <sys/upcall.h>
 #include <sys/thread2.h>
-#include <sys/upcall.h>
 #include <sys/malloc.h>
 #include <sys/sysproto.h>
 #include <sys/lock.h>
diff --git a/sys/kern/kern_wdog.c b/sys/kern/kern_wdog.c
index 3ebe2e312a..09650c2219 100644
--- a/sys/kern/kern_wdog.c
+++ b/sys/kern/kern_wdog.c
@@ -45,7 +45,6 @@
 #include <sys/sysctl.h>
 #include <sys/unistd.h>
 #include <sys/event.h>
-#include <sys/sysctl.h>
 #include <sys/queue.h>
 #include <sys/wdog.h>
 #include <machine/limits.h>
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c
index 1167018ceb..ea6c6a3525 100644
--- a/sys/kern/subr_disk.c
+++ b/sys/kern/subr_disk.c
@@ -78,7 +78,6 @@
  *	@(#)ufs_disksubr.c	8.5 (Berkeley) 1/21/94
  * $FreeBSD: src/sys/kern/subr_disk.c,v 1.20.2.6 2001/10/05 07:14:57 peter Exp $
  * $FreeBSD: src/sys/ufs/ufs/ufs_disksubr.c,v 1.44.2.3 2001/03/05 05:42:19 obrien Exp $
- * $DragonFly: src/sys/kern/subr_disk.c,v 1.40 2008/06/05 18:06:32 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -96,7 +95,6 @@
 #include <sys/disk.h>
 #include <sys/kerneldump.h>
 #include <sys/malloc.h>
-#include <sys/sysctl.h>
 #include <machine/md_var.h>
 #include <sys/ctype.h>
 #include <sys/syslog.h>
diff --git a/sys/kern/subr_disklabel32.c b/sys/kern/subr_disklabel32.c
index c12b1e5d90..02b8eba1f8 100644
--- a/sys/kern/subr_disklabel32.c
+++ b/sys/kern/subr_disklabel32.c
@@ -89,7 +89,6 @@
  *	@(#)ufs_disksubr.c	8.5 (Berkeley) 1/21/94
  * $FreeBSD: src/sys/kern/subr_disk.c,v 1.20.2.6 2001/10/05 07:14:57 peter Exp $
  * $FreeBSD: src/sys/ufs/ufs/ufs_disksubr.c,v 1.44.2.3 2001/03/05 05:42:19 obrien Exp $
- * $DragonFly: src/sys/kern/subr_disklabel32.c,v 1.4 2007/06/19 06:07:57 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -104,7 +103,6 @@
 #include <sys/diskslice.h>
 #include <sys/disk.h>
 #include <sys/dtype.h>		/* DTYPE_* constants */
-#include <sys/sysctl.h>
 #include <machine/md_var.h>
 #include <sys/ctype.h>
 #include <sys/syslog.h>
diff --git a/sys/kern/subr_diskmbr.c b/sys/kern/subr_diskmbr.c
index af63076188..b4a7ef451d 100644
--- a/sys/kern/subr_diskmbr.c
+++ b/sys/kern/subr_diskmbr.c
@@ -36,7 +36,6 @@
  *	from: @(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  *	from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
  * $FreeBSD: src/sys/kern/subr_diskmbr.c,v 1.45 2000/01/28 10:22:07 bde Exp $
- * $DragonFly: src/sys/kern/subr_diskmbr.c,v 1.26 2007/06/19 06:07:57 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -47,7 +46,6 @@
 #define	DOSPTYP_EXTENDED	5
 #define	DOSPTYP_EXTENDEDX	15
 #define	DOSPTYP_ONTRACK		84
-#include <sys/diskslice.h>
 #include <sys/diskmbr.h>
 #include <sys/disk.h>
 #include <sys/malloc.h>
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index b20eb28d04..868aac7221 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -65,7 +65,6 @@
  *
  *	@(#)uipc_socket.c	8.3 (Berkeley) 4/15/94
  * $FreeBSD: src/sys/kern/uipc_socket.c,v 1.68.2.24 2003/11/11 17:18:18 silby Exp $
- * $DragonFly: src/sys/kern/uipc_socket.c,v 1.55 2008/09/02 16:17:52 dillon Exp $
  */
 
 #include "opt_inet.h"
@@ -79,7 +78,6 @@
 #include <sys/domain.h>
 #include <sys/file.h>			/* for struct knote */
 #include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/event.h>
 #include <sys/proc.h>
 #include <sys/protosw.h>
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 2d39a1b345..a7125bb746 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -12,7 +12,6 @@
  *		John S. Dyson.
  *
  * $FreeBSD: src/sys/kern/vfs_bio.c,v 1.242.2.20 2003/05/28 18:38:10 alc Exp $
- * $DragonFly: src/sys/kern/vfs_bio.c,v 1.115 2008/08/13 11:02:31 swildner Exp $
  */
 
 /*
@@ -46,7 +45,6 @@
 #include <sys/vmmeter.h>
 #include <sys/vnode.h>
 #include <sys/dsched.h>
-#include <sys/proc.h>
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/vm_kern.h>
-- 
2.41.0