From 88bf00b5bff8e3959cd87f04025abda28c64dd83 Mon Sep 17 00:00:00 2001
From: gwr <gwr@NetBSD.org>
Date: Wed, 5 Mar 1997 00:01:13 +0000
Subject: [PATCH] No need to block out ZS interrupts in clock_intr() as long as
 we are careful to use the single_inst_* macros.

---
 sys/arch/sun3/sun3/clock.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/sys/arch/sun3/sun3/clock.c b/sys/arch/sun3/sun3/clock.c
index 21b48c0e13bf..879756b6822b 100644
--- a/sys/arch/sun3/sun3/clock.c
+++ b/sys/arch/sun3/sun3/clock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: clock.c,v 1.36 1997/03/04 23:37:48 gwr Exp $	*/
+/*	$NetBSD: clock.c,v 1.37 1997/03/05 00:01:13 gwr Exp $	*/
 
 /*
  * Copyright (c) 1994 Gordon W. Ross
@@ -261,16 +261,16 @@ setstatclockrate(newhz)
 
 /*
  * This is is called by the "custom" interrupt handler.
+ * Note that we can get ZS interrupts while this runs,
+ * and those may touch the interrupt_reg, so we have to
+ * be careful to use the single_inst_* macros to modify
+ * the interrupt register atomically.
  */
 void
 clock_intr(cf)
 	struct clockframe cf;
 {
 	register volatile struct intersil7170 *clk = intersil_clock;
-	int s;
-
-	/* Prevent ZS interrupts while we tickle the clock. */
-	s = splhigh();
 
 	/* Read the clock interrupt register. */
 	(void) clk->clk_intr_reg;
@@ -280,9 +280,6 @@ clock_intr(cf)
 	/* Read the clock intr. reg AGAIN! */
 	(void) clk->clk_intr_reg;
 
-	/* Back to normal clock priority. */
-	splx(s);
-
 	/* Call common clock interrupt handler. */
 	hardclock(&cf);