From owner-p4-projects@FreeBSD.ORG  Sat May 20 18:47:46 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AD66116A43B; Sat, 20 May 2006 18:47:46 +0000 (UTC)
X-Original-To: perforce@freebsd.org
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 708A016A41F
	for <perforce@freebsd.org>; Sat, 20 May 2006 18:47:46 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3BA3443D45
	for <perforce@freebsd.org>; Sat, 20 May 2006 18:47:46 +0000 (GMT)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4KIlBao084278
	for <perforce@freebsd.org>; Sat, 20 May 2006 18:47:11 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4KIlBI7084275
	for perforce@freebsd.org; Sat, 20 May 2006 18:47:11 GMT
	(envelope-from kmacy@freebsd.org)
Date: Sat, 20 May 2006 18:47:11 GMT
Message-Id: <200605201847.k4KIlBI7084275@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 97521 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Sat, 20 May 2006 18:47:47 -0000

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

Change 97521 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/20 18:46:29

	clean up unused function
	add sanity check

Affected files ...

.. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tick.c#6 edit

Differences ...

==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tick.c#6 (text+ko) ====

@@ -43,6 +43,10 @@
 #include <machine/tick.h>
 #include <machine/ver.h>
 
+#ifdef DEBUG
+#include <sys/proc.h>
+#endif
+
 #define	TICK_GRACE	10000
 
 SYSCTL_NODE(_machdep, OID_AUTO, tick, CTLFLAG_RD, 0, "tick statistics");
@@ -101,6 +105,10 @@
 	long delta;
 	int count;
 
+#ifdef DEBUG	
+	if (curthread->td_critnest > 2 || curthread->td_critnest < 1)
+		panic("nested hardclock %d\n", curthread->td_critnest);
+#endif
 	/*
 	 * The sequence of reading the TICK register, calculating the value
 	 * of the next tick and writing it to the TICK_CMPR register must not
@@ -139,6 +147,7 @@
 	}
 	PCPU_SET(tickref, ref);
 	PCPU_SET(tickadj, adj);
+
 }
 
 void
@@ -160,15 +169,6 @@
 		panic("%s: HZ too high, decrease to at least %ld", __func__,
 		    clock / TICK_GRACE);
 #endif
-	/*
-	 * UltraSparc II[e,i] based systems come up with the tick interrupt
-	 * enabled and a handler that resets the tick counter, causing DELAY()
-	 * to not work properly when used early in boot.
-	 * UltraSPARC III based systems come up with the system tick interrupt
-	 * enabled, causing an interrupt storm on startup since they are not
-	 * handled.
-	 */
-	tick_stop();
 	set_cputicker(tick_cputicks, tick_freq, 0);
 }
 
@@ -194,8 +194,3 @@
 	intr_restore_all(s);
 }
 
-void
-tick_stop(void)
-{
-
-}