Clean up some no longer needed includes left over from the locore/locore0 split.

ok tom, mpi, deraadt

2 files changed, 2 insertions, 13 deletions

diff --git a/sys/arch/amd64/amd64/locore.S b/sys/arch/amd64/amd64/locore.S
index 179504c9aca..5fed50f5c73 100644
--- a/sys/arch/amd64/amd64/locore.S
+++ b/sys/arch/amd64/amd64/locore.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locore.S,v 1.89 2017/10/04 02:10:33 guenther Exp $	*/
+/*	$OpenBSD: locore.S,v 1.90 2017/10/05 06:18:10 mlarkin Exp $	*/
 /*	$NetBSD: locore.S,v 1.13 2004/03/25 18:33:17 drochner Exp $	*/
 
 /*
@@ -115,7 +115,6 @@
 #include <machine/param.h>
 #include <machine/segments.h>
 #include <machine/specialreg.h>
-#include <machine/trap.h>
 #include <machine/frameasm.h>
 
 #if NLAPIC > 0
diff --git a/sys/arch/amd64/amd64/locore0.S b/sys/arch/amd64/amd64/locore0.S
index e6ddddb4d0f..6eb679d2235 100644
--- a/sys/arch/amd64/amd64/locore0.S
+++ b/sys/arch/amd64/amd64/locore0.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locore0.S,v 1.2 2017/07/06 06:17:04 deraadt Exp $	*/
+/*	$OpenBSD: locore0.S,v 1.3 2017/10/05 06:18:10 mlarkin Exp $	*/
 /*	$NetBSD: locore.S,v 1.13 2004/03/25 18:33:17 drochner Exp $	*/
 
 /*
@@ -107,20 +107,10 @@
 #include "assym.h"
 #include "lapic.h"
 #include "ksyms.h"
-#include "xen.h"
-#include "hyperv.h"
-
-#include <sys/syscall.h>
 
 #include <machine/param.h>
 #include <machine/segments.h>
 #include <machine/specialreg.h>
-#include <machine/trap.h>
-#include <machine/frameasm.h>
-
-#if NLAPIC > 0
-#include <machine/i82489reg.h>
-#endif
 
 /*
  * override user-land alignment before including asm.h