From 970e300a95eac1db542037dec86ee9c30114a486 Mon Sep 17 00:00:00 2001
From: nonaka <nonaka@NetBSD.org>
Date: Mon, 21 Nov 2005 15:04:52 +0000
Subject: [PATCH] In decr_intr(), update lasttb only when clock interrupt is
 not masked. (sync with macppc/macppc/clock.c: rev.1.11 -> 1.12)

---
 sys/arch/prep/prep/clock.c | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/sys/arch/prep/prep/clock.c b/sys/arch/prep/prep/clock.c
index e3ba1cbf15db..3289929af5ab 100644
--- a/sys/arch/prep/prep/clock.c
+++ b/sys/arch/prep/prep/clock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: clock.c,v 1.11 2005/06/05 17:56:31 he Exp $	*/
+/*	$NetBSD: clock.c,v 1.12 2005/11/21 15:04:52 nonaka Exp $	*/
 /*      $OpenBSD: clock.c,v 1.3 1997/10/13 13:42:53 pefo Exp $	*/
 
 /*
@@ -33,13 +33,15 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.11 2005/06/05 17:56:31 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.12 2005/11/21 15:04:52 nonaka Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
+#include <uvm/uvm_extern.h>
+
 #include <dev/clock_subr.h>
 
 #include <powerpc/spr.h>
@@ -48,9 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.11 2005/06/05 17:56:31 he Exp $");
 
 void decr_intr __P((struct clockframe *));
 
-/*
- * Initially we assume a processor with a bus frequency of 12.5 MHz.
- */
 u_long ticks_per_sec;
 u_long ns_per_tick;
 static long ticks_per_intr;
@@ -188,37 +187,38 @@ decr_intr(frame)
 	 * Based on the actual time delay since the last decrementer reload,
 	 * we arrange for earlier interrupt next time.
 	 */
-	if ((mfpvr() >> 16) == MPC601) {
-		asm volatile ("mfspr %0,%1" : "=r"(tb) : "n"(SPR_RTCL_R));
-	} else {
-		asm volatile ("mftb %0" : "=r"(tb));
-	}
 	asm ("mfdec %0" : "=r"(ticks));
 	for (nticks = 0; ticks < 0; nticks++)
 		ticks += ticks_per_intr;
 	asm volatile ("mtdec %0" :: "r"(ticks));
 
-	/*
-	 * lasttb is used during microtime. Set it to the virtual
-	 * start of this tick interval.
-	 */
-	lasttb = tb + ticks - ticks_per_intr;
-
+	uvmexp.intrs++;
 	intrcnt[CNT_CLOCK]++;
 
 	pri = splclock();
-	if (pri & SPL_CLOCK)
+	if (pri & SPL_CLOCK) {
 		tickspending += nticks;
-	else {
+	} else {
 		nticks += tickspending;
 		tickspending = 0;
 
+		/*
+		 * lasttb is used during microtime. Set it to the virtual
+		 * start of this tick interval.
+		 */
+		if ((mfpvr() >> 16) == MPC601) {
+			asm volatile ("mfspr %0,%1" : "=r"(tb) : "n"(SPR_RTCL_R));
+		} else {
+			asm volatile ("mftb %0" : "=r"(tb));
+		}
+		lasttb = tb + ticks - ticks_per_intr;
+
 		/*
 		 * Reenable interrupts
 		 */
 		asm volatile ("mfmsr %0; ori %0, %0, %1; mtmsr %0"
 			      : "=r"(msr) : "K"(PSL_EE));
-		
+
 		/*
 		 * Do standard timer interrupt stuff.
 		 * Do softclock stuff only on the last iteration.