remove some unused #includes

diff --git a/sys/arch/amd64/amd64/locore.S b/sys/arch/amd64/amd64/locore.S
index 52ae39c..e902b1a 100644 (file)
--- a/sys/arch/amd64/amd64/locore.S
+++ b/sys/arch/amd64/amd64/locore.S
@@ -1,4 +1,4 @@
-/*     $OpenBSD: locore.S,v 1.81 2016/06/22 01:12:38 mikeb Exp $       */
+/*     $OpenBSD: locore.S,v 1.82 2016/07/16 06:04:29 mlarkin Exp $     */
 /*     $NetBSD: locore.S,v 1.13 2004/03/25 18:33:17 drochner Exp $     */
 
 /*
@@ -106,13 +106,10 @@
 
 #include "assym.h"
 #include "lapic.h"
-#include "ioapic.h"
 #include "ksyms.h"
-#include "acpi.h"
 #include "xen.h"
 #include "hyperv.h"
 
-#include <sys/errno.h>
 #include <sys/syscall.h>
 
 #include <machine/param.h>

diff --git a/sys/arch/i386/i386/apicvec.s b/sys/arch/i386/i386/apicvec.s
index dd17c78..26454e4 100644 (file)
--- a/sys/arch/i386/i386/apicvec.s
+++ b/sys/arch/i386/i386/apicvec.s
@@ -1,4 +1,4 @@
-/* $OpenBSD: apicvec.s,v 1.31 2015/07/16 05:10:14 guenther Exp $ */
+/* $OpenBSD: apicvec.s,v 1.32 2016/07/16 06:04:29 mlarkin Exp $ */
 /* $NetBSD: apicvec.s,v 1.1.2.2 2000/02/21 21:54:01 sommerfeld Exp $ */
 
 /*-
@@ -32,6 +32,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "ioapic.h"
+
 #include <machine/i82093reg.h>
 #include <machine/i82489reg.h>
 

diff --git a/sys/arch/i386/i386/locore.s b/sys/arch/i386/i386/locore.s
index 73221f8..214c39f 100644 (file)
--- a/sys/arch/i386/i386/locore.s
+++ b/sys/arch/i386/i386/locore.s
@@ -1,4 +1,4 @@
-/*     $OpenBSD: locore.s,v 1.169 2016/05/23 20:11:49 deraadt Exp $    */
+/*     $OpenBSD: locore.s,v 1.170 2016/07/16 06:04:29 mlarkin Exp $    */
 /*     $NetBSD: locore.s,v 1.145 1996/05/03 19:41:19 christos Exp $    */
 
 /*-
@@ -40,9 +40,7 @@
 #include "assym.h"
 #include "apm.h"
 #include "lapic.h"
-#include "ioapic.h"
 #include "ksyms.h"
-#include "acpi.h"
 
 #include <sys/errno.h>
 #include <sys/syscall.h>