From 981db6d4846ff52a5e76c18517d079599fe5da98 Mon Sep 17 00:00:00 2001
From: Theo de Raadt <deraadt@cvs.openbsd.org>
Date: Sun, 31 Mar 2013 17:07:04 +0000
Subject: try to avoid pulling in pte.h and other more crazy things.  Checked
 against the things that libkvm needs.

---
 sys/arch/amd64/include/cpu.h  | 11 +++++++----
 sys/arch/amd64/include/pmap.h |  6 ++++--
 2 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'sys/arch/amd64')

diff --git a/sys/arch/amd64/include/cpu.h b/sys/arch/amd64/include/cpu.h
index c9977c895bb..06a6ef1599c 100644
--- a/sys/arch/amd64/include/cpu.h
+++ b/sys/arch/amd64/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.79 2013/03/12 09:37:16 mpi Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.80 2013/03/31 17:07:02 deraadt Exp $	*/
 /*	$NetBSD: cpu.h,v 1.1 2003/04/26 18:39:39 fvdl Exp $	*/
 
 /*-
@@ -41,16 +41,19 @@
 /*
  * Definitions unique to x86-64 cpu support.
  */
+#ifdef _KERNEL
 #include <machine/frame.h>
 #include <machine/segments.h>
-#include <machine/intrdefs.h>
 #include <machine/cacheinfo.h>
+#include <machine/intrdefs.h>
 
 #ifdef MULTIPROCESSOR
 #include <machine/i82489reg.h>
 #include <machine/i82489var.h>
 #endif
 
+#endif /* _KERNEL */
+
 #include <sys/device.h>
 #include <sys/lock.h>
 #include <sys/sched.h>
@@ -211,10 +214,10 @@ extern struct cpu_info cpu_info_primary;
 
 #endif	/* MULTIPROCESSOR */
 
-#endif /* _KERNEL */
-
 #include <machine/psl.h>
 
+#endif /* _KERNEL */
+
 #ifdef MULTIPROCESSOR
 #include <sys/mplock.h>
 #endif
diff --git a/sys/arch/amd64/include/pmap.h b/sys/arch/amd64/include/pmap.h
index a3f257fb20a..1493759dc07 100644
--- a/sys/arch/amd64/include/pmap.h
+++ b/sys/arch/amd64/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.40 2013/03/21 15:50:28 deraadt Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.41 2013/03/31 17:07:02 deraadt Exp $	*/
 /*	$NetBSD: pmap.h,v 1.1 2003/04/26 18:39:46 fvdl Exp $	*/
 
 /*
@@ -76,10 +76,12 @@
 #define	_MACHINE_PMAP_H_
 
 #ifndef _LOCORE
+#ifdef _KERNEL
 #include <machine/cpufunc.h>
-#include <machine/pte.h>
 #include <machine/segments.h>
+#endif /* _KERNEL */
 #include <uvm/uvm_object.h>
+#include <machine/pte.h>
 #endif
 
 /*
-- 
cgit v1.2.3