From owner-p4-projects@FreeBSD.ORG  Sun Jan 27 23:12:37 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 42B3716A469; Sun, 27 Jan 2008 23:12:37 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E403916A417
	for <perforce@freebsd.org>; Sun, 27 Jan 2008 23:12:36 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D5C6013C45B
	for <perforce@freebsd.org>; Sun, 27 Jan 2008 23:12:36 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RNCaJ6061795
	for <perforce@freebsd.org>; Sun, 27 Jan 2008 23:12:36 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RNCalE061792
	for perforce@freebsd.org; Sun, 27 Jan 2008 23:12:36 GMT
	(envelope-from imp@freebsd.org)
Date: Sun, 27 Jan 2008 23:12:36 GMT
Message-Id: <200801272312.m0RNCalE061792@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 134257 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: Sun, 27 Jan 2008 23:12:37 -0000

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

Change 134257 by imp@imp_paco-paco on 2008/01/27 23:12:21

	ugly hack

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/mips/intr_machdep.c#3 edit

Differences ...

==== //depot/projects/mips2-jnpr/src/sys/mips/mips/intr_machdep.c#3 (text+ko) ====

@@ -34,6 +34,7 @@
 #include <sys/bus.h>
 #include <sys/interrupt.h>
 
+#include <machine/clock.h>
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/cpuinfo.h>
@@ -134,6 +135,13 @@
 	cause &= ~MIPS_INT_MASK;
 	mips_wr_cause(cause);
 
+#if 0
+	if (intr & CR_INT_CLOCK) {
+		clockintr(intr, tf);
+		intr &= ~CR_INT_CLOCK;
+	}
+#endif
+
 	while ((i = fls(intr)) != 0) {
 		intr &= ~(1 << (i - 1));
 		switch (i) {
@@ -154,8 +162,11 @@
 
 		if (!event || TAILQ_EMPTY(&event->ie_handlers))
 		{
-			printf("stray %s interrupt %d\n",
-			    hard ? "hard" : "soft", i);
+			if (i == 5)
+				clockintr(intr, tf);
+			else
+				printf("stray %s interrupt %d\n",
+				    hard ? "hard" : "soft", i);
 			continue;
 		}