From c3fa5122d6c22f2e64cb790419b1435d4db08761 Mon Sep 17 00:00:00 2001
From: mycroft <mycroft@NetBSD.org>
Date: Sun, 9 Oct 1994 15:00:38 +0000
Subject: [PATCH] #include cpufunc.h from pmap.h.

---
 sys/arch/i386/i386/db_interface.c | 3 +--
 sys/arch/i386/i386/pmap.c         | 3 +--
 sys/arch/i386/i386/vm_machdep.c   | 3 +--
 sys/arch/i386/include/cpufunc.h   | 6 +++++-
 sys/arch/i386/include/pmap.h      | 3 ++-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/sys/arch/i386/i386/db_interface.c b/sys/arch/i386/i386/db_interface.c
index 1c8562082f0f..6eaaea8d8c1d 100644
--- a/sys/arch/i386/i386/db_interface.c
+++ b/sys/arch/i386/i386/db_interface.c
@@ -24,7 +24,7 @@
  * rights to redistribute these changes.
  *
  *	From: db_interface.c,v 2.4 1991/02/05 17:11:13 mrt (CMU)
- *	$Id: db_interface.c,v 1.12 1994/10/09 13:27:07 mycroft Exp $
+ *	$Id: db_interface.c,v 1.13 1994/10/09 15:02:08 mycroft Exp $
  */
 
 /*
@@ -38,7 +38,6 @@
 
 #include <vm/vm.h>
 
-#include <machine/cpufunc.h>
 #include <machine/db_machdep.h>
 
 extern jmp_buf	*db_recover;
diff --git a/sys/arch/i386/i386/pmap.c b/sys/arch/i386/i386/pmap.c
index 6cb207d09408..bdca3f6bd5b4 100644
--- a/sys/arch/i386/i386/pmap.c
+++ b/sys/arch/i386/i386/pmap.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)pmap.c	7.7 (Berkeley)	5/12/91
- *	$Id: pmap.c,v 1.22 1994/09/09 23:58:48 mycroft Exp $
+ *	$Id: pmap.c,v 1.23 1994/10/09 15:02:12 mycroft Exp $
  */
 
 /*
@@ -87,7 +87,6 @@
 #include <vm/vm_page.h>
 
 #include <machine/cpu.h>
-#include <machine/cpufunc.h>
 
 #include <i386/isa/isa.h>
 
diff --git a/sys/arch/i386/i386/vm_machdep.c b/sys/arch/i386/i386/vm_machdep.c
index ac1513eb4dc1..9bc017b85485 100644
--- a/sys/arch/i386/i386/vm_machdep.c
+++ b/sys/arch/i386/i386/vm_machdep.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
- *	$Id: vm_machdep.c,v 1.34 1994/10/09 13:09:12 mycroft Exp $
+ *	$Id: vm_machdep.c,v 1.35 1994/10/09 15:02:15 mycroft Exp $
  */
 
 /*
@@ -57,7 +57,6 @@
 #include <vm/vm_kern.h>
 
 #include <machine/cpu.h>
-#include <machine/cpufunc.h>
 #include <machine/reg.h>
 
 #include "npx.h"
diff --git a/sys/arch/i386/include/cpufunc.h b/sys/arch/i386/include/cpufunc.h
index 5186bd94d6cf..e724b02df869 100644
--- a/sys/arch/i386/include/cpufunc.h
+++ b/sys/arch/i386/include/cpufunc.h
@@ -27,9 +27,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cpufunc.h,v 1.6 1994/10/09 13:02:56 mycroft Exp $
+ *	$Id: cpufunc.h,v 1.7 1994/10/09 15:00:38 mycroft Exp $
  */
 
+#ifndef _I386_CPUFUNC_H_
+#define	_I386_CPUFUNC_H_
+
 /*
  * Functions to provide access to i386-specific instructions.
  */
@@ -128,3 +131,4 @@ enable_intr(void)
 	__asm __volatile("sti");
 }
 
+#endif /* !_I386_CPUFUNC_H_ */
diff --git a/sys/arch/i386/include/pmap.h b/sys/arch/i386/include/pmap.h
index d62ffea6a4db..1e3215db8c5e 100644
--- a/sys/arch/i386/include/pmap.h
+++ b/sys/arch/i386/include/pmap.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)pmap.h	7.4 (Berkeley) 5/12/91
- *	$Id: pmap.h,v 1.13 1994/10/09 13:11:18 mycroft Exp $
+ *	$Id: pmap.h,v 1.14 1994/10/09 15:00:42 mycroft Exp $
  */
 
 /*
@@ -51,6 +51,7 @@
 #ifndef	_I386_PMAP_H_
 #define	_I386_PMAP_H_
 
+#include <machine/cpufunc.h>
 #include <machine/pte.h>
 
 /*