From 591325ea09271a340af7f531b62b9ede70edccc7 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Tue, 2 Jul 2013 22:14:13 +0200
Subject: [PATCH] kernel/platform: Remove some #include duplicates.

---
 sys/platform/pc32/i386/busdma_machdep.c          | 1 -
 sys/platform/pc32/i386/machdep.c                 | 3 ---
 sys/platform/pc32/i386/sys_machdep.c             | 1 -
 sys/platform/pc32/isa/clock.c                    | 1 -
 sys/platform/pc64/isa/clock.c                    | 1 -
 sys/platform/pc64/x86_64/busdma_machdep.c        | 1 -
 sys/platform/pc64/x86_64/machdep.c               | 3 ---
 sys/platform/pc64/x86_64/trap.c                  | 1 -
 sys/platform/vkernel/i386/exception.c            | 1 -
 sys/platform/vkernel/platform/busdma_machdep.c   | 1 -
 sys/platform/vkernel/platform/kqueue.c           | 3 ---
 sys/platform/vkernel/platform/shutdown.c         | 1 -
 sys/platform/vkernel64/platform/busdma_machdep.c | 1 -
 sys/platform/vkernel64/platform/kqueue.c         | 3 ---
 sys/platform/vkernel64/platform/shutdown.c       | 1 -
 sys/platform/vkernel64/x86_64/exception.c        | 1 -
 16 files changed, 24 deletions(-)

diff --git a/sys/platform/pc32/i386/busdma_machdep.c b/sys/platform/pc32/i386/busdma_machdep.c
index 6a5431cffb..cb50f1129c 100644
--- a/sys/platform/pc32/i386/busdma_machdep.c
+++ b/sys/platform/pc32/i386/busdma_machdep.c
@@ -45,7 +45,6 @@
 
 /* XXX needed for to access pmap to convert per-proc virtual to physical */
 #include <sys/proc.h>
-#include <sys/lock.h>
 #include <vm/vm_map.h>
 
 #include <machine/md_var.h>
diff --git a/sys/platform/pc32/i386/machdep.c b/sys/platform/pc32/i386/machdep.c
index 7544257112..c63036ca9c 100644
--- a/sys/platform/pc32/i386/machdep.c
+++ b/sys/platform/pc32/i386/machdep.c
@@ -2475,9 +2475,6 @@ outb(u_int port, u_char data)
 
 
 
-#include "opt_cpu.h"
-
-
 /*
  * initialize all the SMP locks
  */
diff --git a/sys/platform/pc32/i386/sys_machdep.c b/sys/platform/pc32/i386/sys_machdep.c
index a9f85824ff..092c6728ca 100644
--- a/sys/platform/pc32/i386/sys_machdep.c
+++ b/sys/platform/pc32/i386/sys_machdep.c
@@ -42,7 +42,6 @@
 #include <sys/thread.h>
 #include <sys/proc.h>
 #include <sys/priv.h>
-#include <sys/thread.h>
 #include <sys/memrange.h>
 
 #include <vm/vm.h>
diff --git a/sys/platform/pc32/isa/clock.c b/sys/platform/pc32/isa/clock.c
index c8346ae164..5fe8ac611b 100644
--- a/sys/platform/pc32/isa/clock.c
+++ b/sys/platform/pc32/isa/clock.c
@@ -61,7 +61,6 @@
 #include <sys/systimer.h>
 #include <sys/globaldata.h>
 #include <sys/thread2.h>
-#include <sys/systimer.h>
 #include <sys/machintr.h>
 #include <sys/interrupt.h>
 
diff --git a/sys/platform/pc64/isa/clock.c b/sys/platform/pc64/isa/clock.c
index ba6558cb60..638574122e 100644
--- a/sys/platform/pc64/isa/clock.c
+++ b/sys/platform/pc64/isa/clock.c
@@ -64,7 +64,6 @@
 #include <sys/systimer.h>
 #include <sys/globaldata.h>
 #include <sys/thread2.h>
-#include <sys/systimer.h>
 #include <sys/machintr.h>
 #include <sys/interrupt.h>
 
diff --git a/sys/platform/pc64/x86_64/busdma_machdep.c b/sys/platform/pc64/x86_64/busdma_machdep.c
index bf6d69d404..34aa43e9d8 100644
--- a/sys/platform/pc64/x86_64/busdma_machdep.c
+++ b/sys/platform/pc64/x86_64/busdma_machdep.c
@@ -45,7 +45,6 @@
 
 /* XXX needed for to access pmap to convert per-proc virtual to physical */
 #include <sys/proc.h>
-#include <sys/lock.h>
 #include <vm/vm_map.h>
 
 #include <machine/md_var.h>
diff --git a/sys/platform/pc64/x86_64/machdep.c b/sys/platform/pc64/x86_64/machdep.c
index ad390593e8..f443d9a4a0 100644
--- a/sys/platform/pc64/x86_64/machdep.c
+++ b/sys/platform/pc64/x86_64/machdep.c
@@ -2280,9 +2280,6 @@ outb(u_int port, u_char data)
 
 
 
-#include "opt_cpu.h"
-
-
 /*
  * initialize all the SMP locks
  */
diff --git a/sys/platform/pc64/x86_64/trap.c b/sys/platform/pc64/x86_64/trap.c
index 64c3397ae0..881c6312a9 100644
--- a/sys/platform/pc64/x86_64/trap.c
+++ b/sys/platform/pc64/x86_64/trap.c
@@ -61,7 +61,6 @@
 #include <sys/syscall.h>
 #include <sys/sysctl.h>
 #include <sys/sysent.h>
-#include <sys/systm.h>
 #ifdef KTRACE
 #include <sys/ktrace.h>
 #endif
diff --git a/sys/platform/vkernel/i386/exception.c b/sys/platform/vkernel/i386/exception.c
index faacd4f37f..a78c4beb02 100644
--- a/sys/platform/vkernel/i386/exception.c
+++ b/sys/platform/vkernel/i386/exception.c
@@ -39,7 +39,6 @@
 #include <sys/reboot.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
-#include <sys/reboot.h>
 #include <ddb/ddb.h>
 
 #include <sys/thread2.h>
diff --git a/sys/platform/vkernel/platform/busdma_machdep.c b/sys/platform/vkernel/platform/busdma_machdep.c
index 0c4b806958..d39594ba87 100644
--- a/sys/platform/vkernel/platform/busdma_machdep.c
+++ b/sys/platform/vkernel/platform/busdma_machdep.c
@@ -45,7 +45,6 @@
 
 /* XXX needed for to access pmap to convert per-proc virtual to physical */
 #include <sys/proc.h>
-#include <sys/lock.h>
 #include <vm/vm_map.h>
 
 #include <machine/md_var.h>
diff --git a/sys/platform/vkernel/platform/kqueue.c b/sys/platform/vkernel/platform/kqueue.c
index 4613cb2353..1639b1ff14 100644
--- a/sys/platform/vkernel/platform/kqueue.c
+++ b/sys/platform/vkernel/platform/kqueue.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/platform/vkernel/platform/kqueue.c,v 1.6 2007/07/02 03:44:12 dillon Exp $
  */
 
 #include <sys/types.h>
@@ -44,7 +42,6 @@
 #include <sys/bus.h>
 #include <sys/time.h>
 #include <sys/event.h>
-#include <sys/time.h>
 #include <machine/cpu.h>
 #include <machine/globaldata.h>
 #include <machine/md_var.h>
diff --git a/sys/platform/vkernel/platform/shutdown.c b/sys/platform/vkernel/platform/shutdown.c
index b5f280e5e7..d1d2fabb88 100644
--- a/sys/platform/vkernel/platform/shutdown.c
+++ b/sys/platform/vkernel/platform/shutdown.c
@@ -40,7 +40,6 @@
 #include <sys/reboot.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
-#include <sys/reboot.h>
 #include <sys/interrupt.h>
 #include <sys/bus.h>
 #include <ddb/ddb.h>
diff --git a/sys/platform/vkernel64/platform/busdma_machdep.c b/sys/platform/vkernel64/platform/busdma_machdep.c
index 4d6f4b0161..12a568ecb7 100644
--- a/sys/platform/vkernel64/platform/busdma_machdep.c
+++ b/sys/platform/vkernel64/platform/busdma_machdep.c
@@ -43,7 +43,6 @@
 
 /* XXX needed for to access pmap to convert per-proc virtual to physical */
 #include <sys/proc.h>
-#include <sys/lock.h>
 #include <vm/vm_map.h>
 
 #include <machine/md_var.h>
diff --git a/sys/platform/vkernel64/platform/kqueue.c b/sys/platform/vkernel64/platform/kqueue.c
index 875639edda..89ece1eeb4 100644
--- a/sys/platform/vkernel64/platform/kqueue.c
+++ b/sys/platform/vkernel64/platform/kqueue.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/platform/vkernel/platform/kqueue.c,v 1.6 2007/07/02 03:44:12 dillon Exp $
  */
 
 #include <sys/types.h>
@@ -44,7 +42,6 @@
 #include <sys/bus.h>
 #include <sys/time.h>
 #include <sys/event.h>
-#include <sys/time.h>
 #include <machine/cpu.h>
 #include <machine/globaldata.h>
 #include <machine/md_var.h>
diff --git a/sys/platform/vkernel64/platform/shutdown.c b/sys/platform/vkernel64/platform/shutdown.c
index 8a29b1f99b..6f1a5f2b78 100644
--- a/sys/platform/vkernel64/platform/shutdown.c
+++ b/sys/platform/vkernel64/platform/shutdown.c
@@ -40,7 +40,6 @@
 #include <sys/reboot.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
-#include <sys/reboot.h>
 #include <sys/interrupt.h>
 #include <sys/bus.h>
 #include <ddb/ddb.h>
diff --git a/sys/platform/vkernel64/x86_64/exception.c b/sys/platform/vkernel64/x86_64/exception.c
index e466f2bd78..001f0b6ce8 100644
--- a/sys/platform/vkernel64/x86_64/exception.c
+++ b/sys/platform/vkernel64/x86_64/exception.c
@@ -39,7 +39,6 @@
 #include <sys/reboot.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
-#include <sys/reboot.h>
 #include <ddb/ddb.h>
 
 #include <sys/thread2.h>
-- 
2.41.0