From c547ef5cd45400a008cc023d3b907285dbaca554 Mon Sep 17 00:00:00 2001
From: Tor Egge <tegge@FreeBSD.org>
Date: Sun, 5 Apr 1998 01:04:48 +0000
Subject: [PATCH] Remove some unneeded statements that enabled interrupts.

---
 sys/amd64/amd64/tsc.c | 5 ++---
 sys/amd64/isa/clock.c | 5 ++---
 sys/i386/i386/tsc.c   | 5 ++---
 sys/i386/isa/clock.c  | 5 ++---
 sys/isa/atrtc.c       | 5 ++---
 5 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/sys/amd64/amd64/tsc.c b/sys/amd64/amd64/tsc.c
index 1df24b795f4..ade24c32aff 100644
--- a/sys/amd64/amd64/tsc.c
+++ b/sys/amd64/amd64/tsc.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.117 1998/03/16 10:06:58 phk Exp $
+ *	$Id: clock.c,v 1.118 1998/03/30 09:48:47 phk Exp $
  */
 
 /*
@@ -1014,9 +1014,8 @@ cpu_initclocks()
 	if (apic_8254_trial) {
 		
 		printf("APIC_IO: Testing 8254 interrupt delivery\n");
-		__asm __volatile("sti" : : : "memory");
 		while (read_intr_count(8) < 6)
-			__asm __volatile("sti" : : : "memory");
+			;	/* nothing */
 		if (read_intr_count(apic_8254_intr) < 3) {
 			/* 
 			 * The MP table is broken.
diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c
index 1df24b795f4..ade24c32aff 100644
--- a/sys/amd64/isa/clock.c
+++ b/sys/amd64/isa/clock.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.117 1998/03/16 10:06:58 phk Exp $
+ *	$Id: clock.c,v 1.118 1998/03/30 09:48:47 phk Exp $
  */
 
 /*
@@ -1014,9 +1014,8 @@ cpu_initclocks()
 	if (apic_8254_trial) {
 		
 		printf("APIC_IO: Testing 8254 interrupt delivery\n");
-		__asm __volatile("sti" : : : "memory");
 		while (read_intr_count(8) < 6)
-			__asm __volatile("sti" : : : "memory");
+			;	/* nothing */
 		if (read_intr_count(apic_8254_intr) < 3) {
 			/* 
 			 * The MP table is broken.
diff --git a/sys/i386/i386/tsc.c b/sys/i386/i386/tsc.c
index 1df24b795f4..ade24c32aff 100644
--- a/sys/i386/i386/tsc.c
+++ b/sys/i386/i386/tsc.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.117 1998/03/16 10:06:58 phk Exp $
+ *	$Id: clock.c,v 1.118 1998/03/30 09:48:47 phk Exp $
  */
 
 /*
@@ -1014,9 +1014,8 @@ cpu_initclocks()
 	if (apic_8254_trial) {
 		
 		printf("APIC_IO: Testing 8254 interrupt delivery\n");
-		__asm __volatile("sti" : : : "memory");
 		while (read_intr_count(8) < 6)
-			__asm __volatile("sti" : : : "memory");
+			;	/* nothing */
 		if (read_intr_count(apic_8254_intr) < 3) {
 			/* 
 			 * The MP table is broken.
diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c
index 1df24b795f4..ade24c32aff 100644
--- a/sys/i386/isa/clock.c
+++ b/sys/i386/isa/clock.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.117 1998/03/16 10:06:58 phk Exp $
+ *	$Id: clock.c,v 1.118 1998/03/30 09:48:47 phk Exp $
  */
 
 /*
@@ -1014,9 +1014,8 @@ cpu_initclocks()
 	if (apic_8254_trial) {
 		
 		printf("APIC_IO: Testing 8254 interrupt delivery\n");
-		__asm __volatile("sti" : : : "memory");
 		while (read_intr_count(8) < 6)
-			__asm __volatile("sti" : : : "memory");
+			;	/* nothing */
 		if (read_intr_count(apic_8254_intr) < 3) {
 			/* 
 			 * The MP table is broken.
diff --git a/sys/isa/atrtc.c b/sys/isa/atrtc.c
index 1df24b795f4..ade24c32aff 100644
--- a/sys/isa/atrtc.c
+++ b/sys/isa/atrtc.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.117 1998/03/16 10:06:58 phk Exp $
+ *	$Id: clock.c,v 1.118 1998/03/30 09:48:47 phk Exp $
  */
 
 /*
@@ -1014,9 +1014,8 @@ cpu_initclocks()
 	if (apic_8254_trial) {
 		
 		printf("APIC_IO: Testing 8254 interrupt delivery\n");
-		__asm __volatile("sti" : : : "memory");
 		while (read_intr_count(8) < 6)
-			__asm __volatile("sti" : : : "memory");
+			;	/* nothing */
 		if (read_intr_count(apic_8254_intr) < 3) {
 			/* 
 			 * The MP table is broken.