From 449f0bccf805179d228838fd86a2b3c4eb6fb3dd Mon Sep 17 00:00:00 2001
From: bde <bde@FreeBSD.org>
Date: Sun, 20 Sep 1998 19:56:28 +0000
Subject: [PATCH] Attempt to work around a bug in the previous commit related
 to non-reentrancy of SMP clock locking.  Depend on the giant lock protecting
 clkintr().

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

diff --git a/sys/amd64/amd64/tsc.c b/sys/amd64/amd64/tsc.c
index 667a52ef8c11..7515141cb1f6 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.125 1998/09/06 22:41:41 tegge Exp $
+ *	$Id: clock.c,v 1.126 1998/09/20 03:47:54 bde Exp $
  */
 
 /*
@@ -208,7 +208,7 @@ clkintr(struct clockframe frame)
 		 * hardware counter must be read to ensure monotonicity
 		 * despite multiple rollovers and misbehaving hardware.
 		 */
-		disable_intr();
+		(disable_intr)();	/* XXX avoid clock locking */
 		if (i8254_ticked) {
 			i8254_get_timecount(NULL);
 			i8254_ticked = 0;
@@ -216,7 +216,7 @@ clkintr(struct clockframe frame)
 			i8254_offset += timer0_max_count;
 			i8254_lastcount = 0;
 		}
-		enable_intr();
+		(enable_intr)();	/* XXX avoid clock locking */
 	}
 	timer_func(&frame);
 	switch (timer0_state) {
diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c
index 667a52ef8c11..7515141cb1f6 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.125 1998/09/06 22:41:41 tegge Exp $
+ *	$Id: clock.c,v 1.126 1998/09/20 03:47:54 bde Exp $
  */
 
 /*
@@ -208,7 +208,7 @@ clkintr(struct clockframe frame)
 		 * hardware counter must be read to ensure monotonicity
 		 * despite multiple rollovers and misbehaving hardware.
 		 */
-		disable_intr();
+		(disable_intr)();	/* XXX avoid clock locking */
 		if (i8254_ticked) {
 			i8254_get_timecount(NULL);
 			i8254_ticked = 0;
@@ -216,7 +216,7 @@ clkintr(struct clockframe frame)
 			i8254_offset += timer0_max_count;
 			i8254_lastcount = 0;
 		}
-		enable_intr();
+		(enable_intr)();	/* XXX avoid clock locking */
 	}
 	timer_func(&frame);
 	switch (timer0_state) {
diff --git a/sys/i386/i386/tsc.c b/sys/i386/i386/tsc.c
index 667a52ef8c11..7515141cb1f6 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.125 1998/09/06 22:41:41 tegge Exp $
+ *	$Id: clock.c,v 1.126 1998/09/20 03:47:54 bde Exp $
  */
 
 /*
@@ -208,7 +208,7 @@ clkintr(struct clockframe frame)
 		 * hardware counter must be read to ensure monotonicity
 		 * despite multiple rollovers and misbehaving hardware.
 		 */
-		disable_intr();
+		(disable_intr)();	/* XXX avoid clock locking */
 		if (i8254_ticked) {
 			i8254_get_timecount(NULL);
 			i8254_ticked = 0;
@@ -216,7 +216,7 @@ clkintr(struct clockframe frame)
 			i8254_offset += timer0_max_count;
 			i8254_lastcount = 0;
 		}
-		enable_intr();
+		(enable_intr)();	/* XXX avoid clock locking */
 	}
 	timer_func(&frame);
 	switch (timer0_state) {
diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c
index 667a52ef8c11..7515141cb1f6 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.125 1998/09/06 22:41:41 tegge Exp $
+ *	$Id: clock.c,v 1.126 1998/09/20 03:47:54 bde Exp $
  */
 
 /*
@@ -208,7 +208,7 @@ clkintr(struct clockframe frame)
 		 * hardware counter must be read to ensure monotonicity
 		 * despite multiple rollovers and misbehaving hardware.
 		 */
-		disable_intr();
+		(disable_intr)();	/* XXX avoid clock locking */
 		if (i8254_ticked) {
 			i8254_get_timecount(NULL);
 			i8254_ticked = 0;
@@ -216,7 +216,7 @@ clkintr(struct clockframe frame)
 			i8254_offset += timer0_max_count;
 			i8254_lastcount = 0;
 		}
-		enable_intr();
+		(enable_intr)();	/* XXX avoid clock locking */
 	}
 	timer_func(&frame);
 	switch (timer0_state) {
diff --git a/sys/isa/atrtc.c b/sys/isa/atrtc.c
index 667a52ef8c11..7515141cb1f6 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.125 1998/09/06 22:41:41 tegge Exp $
+ *	$Id: clock.c,v 1.126 1998/09/20 03:47:54 bde Exp $
  */
 
 /*
@@ -208,7 +208,7 @@ clkintr(struct clockframe frame)
 		 * hardware counter must be read to ensure monotonicity
 		 * despite multiple rollovers and misbehaving hardware.
 		 */
-		disable_intr();
+		(disable_intr)();	/* XXX avoid clock locking */
 		if (i8254_ticked) {
 			i8254_get_timecount(NULL);
 			i8254_ticked = 0;
@@ -216,7 +216,7 @@ clkintr(struct clockframe frame)
 			i8254_offset += timer0_max_count;
 			i8254_lastcount = 0;
 		}
-		enable_intr();
+		(enable_intr)();	/* XXX avoid clock locking */
 	}
 	timer_func(&frame);
 	switch (timer0_state) {