From owner-p4-projects@FreeBSD.ORG  Tue Jun  8 03:40:00 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D28AA16A4D1; Tue,  8 Jun 2004 03:39:59 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id AC90E16A4CE
	for <perforce@freebsd.org>; Tue,  8 Jun 2004 03:39:59 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9FC7A43D46
	for <perforce@freebsd.org>; Tue,  8 Jun 2004 03:39:59 +0000 (GMT)
	(envelope-from jmallett@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i583dx3u021430
	for <perforce@freebsd.org>; Tue, 8 Jun 2004 03:39:59 GMT
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i583dxbC021427
	for perforce@freebsd.org; Tue, 8 Jun 2004 03:39:59 GMT
	(envelope-from jmallett@freebsd.org)
Date: Tue, 8 Jun 2004 03:39:59 GMT
Message-Id: <200406080339.i583dxbC021427@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmallett@freebsd.org using -f
From: Juli Mallett <jmallett@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 54391 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Jun 2004 03:40:00 -0000

http://perforce.freebsd.org/chv.cgi?CH=54391

Change 54391 by jmallett@jmallett_oingo on 2004/06/08 03:39:20

	Simplify the clock logic for the greater good for now.

Affected files ...

.. //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#30 edit

Differences ...

==== //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#30 (text+ko) ====

@@ -168,31 +168,21 @@
 void
 platform_intr(struct trapframe *tf)
 {
-	static u_register_t next, last;
 	register_t cause;
 
 	cause = mips_rd_cause();
 
 	if (cause & MIPS_INT_MASK_5) {
 		struct clockframe cf;
-		u_register_t now;
 
 		/*
 		 * Set next clock edge.
 		 */
-		if (next == 0)
-			next = mips_rd_count();
-		last = next;
-		next += curcpu()->ci_cycles_per_hz;
-		now = mips_rd_count();
-		if (last < next) {
-			while (now > next)
-				next += curcpu()->ci_cycles_per_hz;
-		}
-		mips_wr_compare(next);
 		cf.sr = tf->tf_regs[TF_SR];
 		cf.pc = tf->tf_regs[TF_EPC];
 		hardclock(&cf);
+		mips_wr_compare(mips_rd_count() +
+				curcpu()->ci_cycles_per_hz);
 	} else {
 		printf("stray intr cause %lx\n", cause);
 	}