summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkato <kato@FreeBSD.org>1998-04-06 03:38:18 +0000
committerkato <kato@FreeBSD.org>1998-04-06 03:38:18 +0000
commit81a85710912ade8d75a90cdbb95122e7ef0152dd (patch)
treebef0c65ad5a3fe563599b1a8004446b9ab87ab9d
parentf5a109a74e09e285994d80b428453509a64aacab (diff)
downloadFreeBSD-src-81a85710912ade8d75a90cdbb95122e7ef0152dd.zip
FreeBSD-src-81a85710912ade8d75a90cdbb95122e7ef0152dd.tar.gz
Sync with sys/i386/isa/clock.c revision 1.119.
-rw-r--r--sys/pc98/cbus/clock.c5
-rw-r--r--sys/pc98/cbus/pcrtc.c5
-rw-r--r--sys/pc98/pc98/clock.c5
3 files changed, 6 insertions, 9 deletions
diff --git a/sys/pc98/cbus/clock.c b/sys/pc98/cbus/clock.c
index ba30dfc..9c8e416 100644
--- a/sys/pc98/cbus/clock.c
+++ b/sys/pc98/cbus/clock.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91
- * $Id: clock.c,v 1.50 1998/03/17 08:42:18 kato Exp $
+ * $Id: clock.c,v 1.51 1998/03/31 07:53:13 kato Exp $
*/
/*
@@ -1312,9 +1312,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/pc98/cbus/pcrtc.c b/sys/pc98/cbus/pcrtc.c
index ba30dfc..9c8e416 100644
--- a/sys/pc98/cbus/pcrtc.c
+++ b/sys/pc98/cbus/pcrtc.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91
- * $Id: clock.c,v 1.50 1998/03/17 08:42:18 kato Exp $
+ * $Id: clock.c,v 1.51 1998/03/31 07:53:13 kato Exp $
*/
/*
@@ -1312,9 +1312,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/pc98/pc98/clock.c b/sys/pc98/pc98/clock.c
index ba30dfc..9c8e416 100644
--- a/sys/pc98/pc98/clock.c
+++ b/sys/pc98/pc98/clock.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91
- * $Id: clock.c,v 1.50 1998/03/17 08:42:18 kato Exp $
+ * $Id: clock.c,v 1.51 1998/03/31 07:53:13 kato Exp $
*/
/*
@@ -1312,9 +1312,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.
OpenPOWER on IntegriCloud