From 288e2230b5b3d025e261145cc7f13b5decabb4be Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Thu, 29 May 1997 05:11:11 +0000
Subject: [PATCH] remove no longer needed opt_smp.h includes

---
 sys/amd64/amd64/autoconf.c   | 3 +--
 sys/amd64/amd64/cpu_switch.S | 3 +--
 sys/amd64/amd64/exception.S  | 3 +--
 sys/amd64/amd64/exception.s  | 3 +--
 sys/amd64/amd64/locore.S     | 3 +--
 sys/amd64/amd64/locore.s     | 3 +--
 sys/amd64/amd64/pmap.c       | 3 +--
 sys/amd64/amd64/support.S    | 3 +--
 sys/amd64/amd64/support.s    | 3 +--
 sys/amd64/amd64/swtch.s      | 3 +--
 sys/i386/i386/autoconf.c     | 3 +--
 sys/i386/i386/exception.s    | 3 +--
 sys/i386/i386/locore.s       | 3 +--
 sys/i386/i386/microtime.s    | 3 +--
 sys/i386/i386/mplock.s       | 3 +--
 sys/i386/i386/pmap.c         | 3 +--
 sys/i386/i386/support.s      | 3 +--
 sys/i386/i386/swtch.s        | 3 +--
 18 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c
index 79789f88cc51..4a9c7da4a537 100644
--- a/sys/amd64/amd64/autoconf.c
+++ b/sys/amd64/amd64/autoconf.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)autoconf.c	7.1 (Berkeley) 5/9/91
- *	$Id: autoconf.c,v 1.67 1997/05/04 15:24:19 joerg Exp $
+ *	$Id: autoconf.c,v 1.68 1997/05/11 18:05:36 tegge Exp $
  */
 
 /*
@@ -45,7 +45,6 @@
  * devices are determined (from possibilities mentioned in ioconf.c),
  * and the drivers are initialized.
  */
-#include "opt_smp.h"
 #include "opt_cd9660.h"
 
 #include <sys/param.h>
diff --git a/sys/amd64/amd64/cpu_switch.S b/sys/amd64/amd64/cpu_switch.S
index feee78eb9738..66d462687bc8 100644
--- a/sys/amd64/amd64/cpu_switch.S
+++ b/sys/amd64/amd64/cpu_switch.S
@@ -33,12 +33,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: swtch.s,v 1.48 1997/04/26 11:45:24 peter Exp $
+ *	$Id: swtch.s,v 1.49 1997/04/28 08:39:48 fsmp Exp $
  */
 
 #include "npx.h"
 #include "opt_user_ldt.h"
-#include "opt_smp.h"
 #include "opt_smp_privpages.h"
 
 #include <sys/rtprio.h>
diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S
index b21919e87169..23b3f14349a6 100644
--- a/sys/amd64/amd64/exception.S
+++ b/sys/amd64/amd64/exception.S
@@ -30,10 +30,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: exception.s,v 1.2 1997/05/24 17:09:44 smp Exp smp $
+ *	$Id: exception.s,v 1.27 1997/05/26 18:00:34 fsmp Exp $
  */
 
-#include "opt_smp.h"
 #include "npx.h"				/* NNPX */
 #include "assym.s"				/* system defines */
 #include <sys/errno.h>				/* error return codes */
diff --git a/sys/amd64/amd64/exception.s b/sys/amd64/amd64/exception.s
index b21919e87169..23b3f14349a6 100644
--- a/sys/amd64/amd64/exception.s
+++ b/sys/amd64/amd64/exception.s
@@ -30,10 +30,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: exception.s,v 1.2 1997/05/24 17:09:44 smp Exp smp $
+ *	$Id: exception.s,v 1.27 1997/05/26 18:00:34 fsmp Exp $
  */
 
-#include "opt_smp.h"
 #include "npx.h"				/* NNPX */
 #include "assym.s"				/* system defines */
 #include <sys/errno.h>				/* error return codes */
diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S
index 86b4b5f6ebe9..b35cac7f7fdf 100644
--- a/sys/amd64/amd64/locore.S
+++ b/sys/amd64/amd64/locore.S
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)locore.s	7.3 (Berkeley) 5/13/91
- *	$Id: locore.s,v 1.86 1997/04/26 11:45:08 peter Exp $
+ *	$Id: locore.s,v 1.87 1997/05/15 19:12:56 tegge Exp $
  *
  *		originally from: locore.s, by William F. Jolitz
  *
@@ -47,7 +47,6 @@
 #include "opt_cpu.h"
 #include "opt_ddb.h"
 #include "opt_userconfig.h"
-#include "opt_smp.h"
 #include "opt_smp_privpages.h"
 #include "opt_serial.h"
 
diff --git a/sys/amd64/amd64/locore.s b/sys/amd64/amd64/locore.s
index 86b4b5f6ebe9..b35cac7f7fdf 100644
--- a/sys/amd64/amd64/locore.s
+++ b/sys/amd64/amd64/locore.s
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)locore.s	7.3 (Berkeley) 5/13/91
- *	$Id: locore.s,v 1.86 1997/04/26 11:45:08 peter Exp $
+ *	$Id: locore.s,v 1.87 1997/05/15 19:12:56 tegge Exp $
  *
  *		originally from: locore.s, by William F. Jolitz
  *
@@ -47,7 +47,6 @@
 #include "opt_cpu.h"
 #include "opt_ddb.h"
 #include "opt_userconfig.h"
-#include "opt_smp.h"
 #include "opt_smp_privpages.h"
 #include "opt_serial.h"
 
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index 97567750b908..3f74036194e9 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
- *	$Id: pmap.c,v 1.142 1997/04/26 11:45:19 peter Exp $
+ *	$Id: pmap.c,v 1.143 1997/04/27 12:11:43 peter Exp $
  */
 
 /*
@@ -68,7 +68,6 @@
  *	and to when physical maps must be made correct.
  */
 
-#include "opt_smp.h"
 #include "opt_cpu.h"
 
 #define PMAP_LOCK 1
diff --git a/sys/amd64/amd64/support.S b/sys/amd64/amd64/support.S
index 5197f7ea1dc5..b87370b8da04 100644
--- a/sys/amd64/amd64/support.S
+++ b/sys/amd64/amd64/support.S
@@ -30,10 +30,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: support.s,v 1.51 1997/03/05 16:30:55 bde Exp $
+ *	$Id: support.s,v 1.52 1997/04/26 11:45:21 peter Exp $
  */
 
-#include "opt_smp.h"
 #include "npx.h"
 #include "opt_cpu.h"
 
diff --git a/sys/amd64/amd64/support.s b/sys/amd64/amd64/support.s
index 5197f7ea1dc5..b87370b8da04 100644
--- a/sys/amd64/amd64/support.s
+++ b/sys/amd64/amd64/support.s
@@ -30,10 +30,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: support.s,v 1.51 1997/03/05 16:30:55 bde Exp $
+ *	$Id: support.s,v 1.52 1997/04/26 11:45:21 peter Exp $
  */
 
-#include "opt_smp.h"
 #include "npx.h"
 #include "opt_cpu.h"
 
diff --git a/sys/amd64/amd64/swtch.s b/sys/amd64/amd64/swtch.s
index feee78eb9738..66d462687bc8 100644
--- a/sys/amd64/amd64/swtch.s
+++ b/sys/amd64/amd64/swtch.s
@@ -33,12 +33,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: swtch.s,v 1.48 1997/04/26 11:45:24 peter Exp $
+ *	$Id: swtch.s,v 1.49 1997/04/28 08:39:48 fsmp Exp $
  */
 
 #include "npx.h"
 #include "opt_user_ldt.h"
-#include "opt_smp.h"
 #include "opt_smp_privpages.h"
 
 #include <sys/rtprio.h>
diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c
index 79789f88cc51..4a9c7da4a537 100644
--- a/sys/i386/i386/autoconf.c
+++ b/sys/i386/i386/autoconf.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)autoconf.c	7.1 (Berkeley) 5/9/91
- *	$Id: autoconf.c,v 1.67 1997/05/04 15:24:19 joerg Exp $
+ *	$Id: autoconf.c,v 1.68 1997/05/11 18:05:36 tegge Exp $
  */
 
 /*
@@ -45,7 +45,6 @@
  * devices are determined (from possibilities mentioned in ioconf.c),
  * and the drivers are initialized.
  */
-#include "opt_smp.h"
 #include "opt_cd9660.h"
 
 #include <sys/param.h>
diff --git a/sys/i386/i386/exception.s b/sys/i386/i386/exception.s
index b21919e87169..23b3f14349a6 100644
--- a/sys/i386/i386/exception.s
+++ b/sys/i386/i386/exception.s
@@ -30,10 +30,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: exception.s,v 1.2 1997/05/24 17:09:44 smp Exp smp $
+ *	$Id: exception.s,v 1.27 1997/05/26 18:00:34 fsmp Exp $
  */
 
-#include "opt_smp.h"
 #include "npx.h"				/* NNPX */
 #include "assym.s"				/* system defines */
 #include <sys/errno.h>				/* error return codes */
diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.s
index 86b4b5f6ebe9..b35cac7f7fdf 100644
--- a/sys/i386/i386/locore.s
+++ b/sys/i386/i386/locore.s
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)locore.s	7.3 (Berkeley) 5/13/91
- *	$Id: locore.s,v 1.86 1997/04/26 11:45:08 peter Exp $
+ *	$Id: locore.s,v 1.87 1997/05/15 19:12:56 tegge Exp $
  *
  *		originally from: locore.s, by William F. Jolitz
  *
@@ -47,7 +47,6 @@
 #include "opt_cpu.h"
 #include "opt_ddb.h"
 #include "opt_userconfig.h"
-#include "opt_smp.h"
 #include "opt_smp_privpages.h"
 #include "opt_serial.h"
 
diff --git a/sys/i386/i386/microtime.s b/sys/i386/i386/microtime.s
index ab1475d74200..4baee4b0294c 100644
--- a/sys/i386/i386/microtime.s
+++ b/sys/i386/i386/microtime.s
@@ -32,11 +32,10 @@
  * SUCH DAMAGE.
  *
  *	from: Steve McCanne's microtime code
- *	$Id: microtime.s,v 1.21 1997/04/26 11:45:13 peter Exp $
+ *	$Id: microtime.s,v 1.22 1997/04/26 19:47:59 peter Exp $
  */
 
 #include "opt_cpu.h"
-#include "opt_smp.h"
 
 #ifdef APIC_IO
 #include <machine/apic.h>
diff --git a/sys/i386/i386/mplock.s b/sys/i386/i386/mplock.s
index 69cc1db09f3f..b2052f592c0d 100644
--- a/sys/i386/i386/mplock.s
+++ b/sys/i386/i386/mplock.s
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: mplock.s,v 1.1 1997/05/03 19:00:42 smp Exp smp $
+ * $Id: mplock.s,v 1.2 1997/05/03 19:24:16 fsmp Exp $
  *
  * Functions for locking between CPUs in a SMP system.
  *
@@ -22,7 +22,6 @@
  */
 
 #include "opt_ddb.h"
-#include "opt_smp.h"
 #include "assym.s"			/* system definitions */
 #include <machine/specialreg.h>		/* x86 special registers */
 #include <machine/asmacros.h>		/* miscellaneous asm macros */
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index 97567750b908..3f74036194e9 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
- *	$Id: pmap.c,v 1.142 1997/04/26 11:45:19 peter Exp $
+ *	$Id: pmap.c,v 1.143 1997/04/27 12:11:43 peter Exp $
  */
 
 /*
@@ -68,7 +68,6 @@
  *	and to when physical maps must be made correct.
  */
 
-#include "opt_smp.h"
 #include "opt_cpu.h"
 
 #define PMAP_LOCK 1
diff --git a/sys/i386/i386/support.s b/sys/i386/i386/support.s
index 5197f7ea1dc5..b87370b8da04 100644
--- a/sys/i386/i386/support.s
+++ b/sys/i386/i386/support.s
@@ -30,10 +30,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: support.s,v 1.51 1997/03/05 16:30:55 bde Exp $
+ *	$Id: support.s,v 1.52 1997/04/26 11:45:21 peter Exp $
  */
 
-#include "opt_smp.h"
 #include "npx.h"
 #include "opt_cpu.h"
 
diff --git a/sys/i386/i386/swtch.s b/sys/i386/i386/swtch.s
index feee78eb9738..66d462687bc8 100644
--- a/sys/i386/i386/swtch.s
+++ b/sys/i386/i386/swtch.s
@@ -33,12 +33,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: swtch.s,v 1.48 1997/04/26 11:45:24 peter Exp $
+ *	$Id: swtch.s,v 1.49 1997/04/28 08:39:48 fsmp Exp $
  */
 
 #include "npx.h"
 #include "opt_user_ldt.h"
-#include "opt_smp.h"
 #include "opt_smp_privpages.h"
 
 #include <sys/rtprio.h>