From owner-p4-projects@FreeBSD.ORG  Mon Jun 14 22:45:01 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B85AC16A4D0; Mon, 14 Jun 2004 22:45:01 +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 9335816A4CE
	for <perforce@freebsd.org>; Mon, 14 Jun 2004 22:45:01 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8CB7243D46
	for <perforce@freebsd.org>; Mon, 14 Jun 2004 22:45:01 +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 i5EMifY3042386
	for <perforce@freebsd.org>; Mon, 14 Jun 2004 22:44:41 GMT
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5EMifbM042383
	for perforce@freebsd.org; Mon, 14 Jun 2004 22:44:41 GMT
	(envelope-from jmallett@freebsd.org)
Date: Mon, 14 Jun 2004 22:44:41 GMT
Message-Id: <200406142244.i5EMifbM042383@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 54962 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: Mon, 14 Jun 2004 22:45:02 -0000

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

Change 54962 by jmallett@jmallett_oingo on 2004/06/14 22:43:41

	Kills interrupt sharing dead.

Affected files ...

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

Differences ...

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

@@ -182,6 +182,8 @@
 	if (intr < 0 || intr > 5)
 		panic("%s called for unknown hard intr %d", __func__, intr);
 	ih = &intrhard[intr];
+	if (ih->handler != NULL && ih->handler != handler)
+		panic("%s cannot share hard intr %d", __func__, intr);
 	ih->handler = handler;
 	ih->arg = arg;
 
@@ -197,6 +199,8 @@
 	if (intr < 0 || intr > 1)
 		panic("%s called for unknown soft intr %d", __func__, intr);
 	ih = &intrsoft[intr];
+	if (ih->handler != NULL && ih->handler != handler)
+		panic("%s cannot share soft intr %d", __func__, intr);
 	ih->handler = handler;
 	ih->arg = arg;