7 files changed, 14 insertions, 29 deletions

diff --git a/sys/amd64/include/apicreg.h b/sys/amd64/include/apicreg.h
index 170eb78ab0321..8df09cdd30d50 100644
--- a/sys/amd64/include/apicreg.h
+++ b/sys/amd64/include/apicreg.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: apic.h,v 1.5 1997/07/18 19:47:48 smp Exp smp $
+ *	$Id: apic.h,v 1.6 1997/07/30 22:44:20 smp Exp smp $
  */
 
 #ifndef _MACHINE_APIC_H_
@@ -220,10 +220,8 @@ typedef struct IOAPIC ioapic_t;
  * various code 'logical' values
  */
 
-#ifdef TEST_LOPRIO
+/* default level for TPR */
 #define LOPRIO_LEVEL		0x00000010	/* TPR of CPUs accepting INT */
-#define ALLHWI_LEVEL		0x00000000	/* TPR of CPU grabbing INTs */
-#endif /** TEST_LOPRIO */
 
 /* XXX these 2 don't really belong here... */
 #define COUNT_FIELD		0x00ffffff	/* count portion of the lock */
diff --git a/sys/amd64/include/smp.h b/sys/amd64/include/smp.h
index 9dcefd2b52696..409513a5cd0bb 100644
--- a/sys/amd64/include/smp.h
+++ b/sys/amd64/include/smp.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: smp.h,v 1.17 1997/07/28 03:40:09 smp Exp smp $
+ * $Id: smp.h,v 1.18 1997/07/30 22:44:20 smp Exp smp $
  *
  */
 
@@ -74,7 +74,7 @@ extern volatile u_int		started_cpus;
 extern u_int			vec[];
 extern u_int			Xintr8254;
 extern u_int			mask8254;
-extern struct simple_lock	imen_lock;
+extern volatile struct simple_lock	imen_lock;
 
 /* functions in apic_ipl.s */
 void	vec8254			__P((void));
diff --git a/sys/i386/include/apic.h b/sys/i386/include/apic.h
index 170eb78ab0321..8df09cdd30d50 100644
--- a/sys/i386/include/apic.h
+++ b/sys/i386/include/apic.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: apic.h,v 1.5 1997/07/18 19:47:48 smp Exp smp $
+ *	$Id: apic.h,v 1.6 1997/07/30 22:44:20 smp Exp smp $
  */
 
 #ifndef _MACHINE_APIC_H_
@@ -220,10 +220,8 @@ typedef struct IOAPIC ioapic_t;
  * various code 'logical' values
  */
 
-#ifdef TEST_LOPRIO
+/* default level for TPR */
 #define LOPRIO_LEVEL		0x00000010	/* TPR of CPUs accepting INT */
-#define ALLHWI_LEVEL		0x00000000	/* TPR of CPU grabbing INTs */
-#endif /** TEST_LOPRIO */
 
 /* XXX these 2 don't really belong here... */
 #define COUNT_FIELD		0x00ffffff	/* count portion of the lock */
diff --git a/sys/i386/include/apicreg.h b/sys/i386/include/apicreg.h
index 170eb78ab0321..8df09cdd30d50 100644
--- a/sys/i386/include/apicreg.h
+++ b/sys/i386/include/apicreg.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: apic.h,v 1.5 1997/07/18 19:47:48 smp Exp smp $
+ *	$Id: apic.h,v 1.6 1997/07/30 22:44:20 smp Exp smp $
  */
 
 #ifndef _MACHINE_APIC_H_
@@ -220,10 +220,8 @@ typedef struct IOAPIC ioapic_t;
  * various code 'logical' values
  */
 
-#ifdef TEST_LOPRIO
+/* default level for TPR */
 #define LOPRIO_LEVEL		0x00000010	/* TPR of CPUs accepting INT */
-#define ALLHWI_LEVEL		0x00000000	/* TPR of CPU grabbing INTs */
-#endif /** TEST_LOPRIO */
 
 /* XXX these 2 don't really belong here... */
 #define COUNT_FIELD		0x00ffffff	/* count portion of the lock */
diff --git a/sys/i386/include/smp.h b/sys/i386/include/smp.h
index 9dcefd2b52696..409513a5cd0bb 100644
--- a/sys/i386/include/smp.h
+++ b/sys/i386/include/smp.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: smp.h,v 1.17 1997/07/28 03:40:09 smp Exp smp $
+ * $Id: smp.h,v 1.18 1997/07/30 22:44:20 smp Exp smp $
  *
  */
 
@@ -74,7 +74,7 @@ extern volatile u_int		started_cpus;
 extern u_int			vec[];
 extern u_int			Xintr8254;
 extern u_int			mask8254;
-extern struct simple_lock	imen_lock;
+extern volatile struct simple_lock	imen_lock;
 
 /* functions in apic_ipl.s */
 void	vec8254			__P((void));
diff --git a/sys/i386/include/smptests.h b/sys/i386/include/smptests.h
index 001091211acc6..bb4457018f875 100644
--- a/sys/i386/include/smptests.h
+++ b/sys/i386/include/smptests.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: smptests.h,v 1.16 1997/07/26 01:47:26 fsmp Exp $
+ *	$Id: smptests.h,v 1.19 1997/07/30 22:44:20 smp Exp smp $
  */
 
 #ifndef _MACHINE_SMPTESTS_H_
@@ -61,8 +61,8 @@
  * 100.51s real  132.67s user   50.91s system	# time make -j20
  *
  * Note: currently broken for INTerrupting ISA cards, including onboard IDE.
-#define PEND_INTS
  */
+#define PEND_INTS
 
 
 /*
@@ -99,15 +99,6 @@
 
 
 /*
- * use 'lowest priority' for sending IRQs to CPUs
- *
- * i386/i386/mplock.s, i386/i386/mpapic.c, kern/init_main.c
- *
- */
-#define TEST_LOPRIO
-
-
-/*
  * deal with broken smp_idleloop()
  */
 #define IGNORE_IDLEPROCS
diff --git a/sys/sys/smp.h b/sys/sys/smp.h
index 9dcefd2b52696..409513a5cd0bb 100644
--- a/sys/sys/smp.h
+++ b/sys/sys/smp.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: smp.h,v 1.17 1997/07/28 03:40:09 smp Exp smp $
+ * $Id: smp.h,v 1.18 1997/07/30 22:44:20 smp Exp smp $
  *
  */
 
@@ -74,7 +74,7 @@ extern volatile u_int		started_cpus;
 extern u_int			vec[];
 extern u_int			Xintr8254;
 extern u_int			mask8254;
-extern struct simple_lock	imen_lock;
+extern volatile struct simple_lock	imen_lock;
 
 /* functions in apic_ipl.s */
 void	vec8254			__P((void));