From owner-p4-projects@FreeBSD.ORG  Tue May  8 22:40:54 2007
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 DEF1116A408; Tue,  8 May 2007 22:40:53 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 9BC6716A406
	for <perforce@freebsd.org>; Tue,  8 May 2007 22:40:53 +0000 (UTC)
	(envelope-from bms@incunabulum.net)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 8EA0613C480
	for <perforce@freebsd.org>; Tue,  8 May 2007 22:40:53 +0000 (UTC)
	(envelope-from bms@incunabulum.net)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l48Mere2070973
	for <perforce@freebsd.org>; Tue, 8 May 2007 22:40:53 GMT
	(envelope-from bms@incunabulum.net)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l48Mer9q070966
	for perforce@freebsd.org; Tue, 8 May 2007 22:40:53 GMT
	(envelope-from bms@incunabulum.net)
Date: Tue, 8 May 2007 22:40:53 GMT
Message-Id: <200705082240.l48Mer9q070966@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bms@incunabulum.net using -f
From: Bruce M Simpson <bms@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 119529 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: Tue, 08 May 2007 22:40:54 -0000

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

Change 119529 by bms@bms_anglepoise on 2007/05/08 22:40:28

	turn 'busy resource' back into a panic.
	trim comments.

Affected files ...

.. //depot/projects/mips2/src/sys/mips/mips/nexus.c#10 edit

Differences ...

==== //depot/projects/mips2/src/sys/mips/mips/nexus.c#10 (text+ko) ====

@@ -199,11 +199,6 @@
 nexus_attach(device_t dev)
 {
 
-	/*
-	 * XXX: next line needed to probe clock (intr 5),
-	 * otherwise no clock and lots of stray hard interrupt 5
-	 * once compare counts down.
-	 */
 	bus_generic_probe(dev);
 	bus_enumerate_hinted_children(dev);
 	bus_generic_attach(dev);
@@ -323,9 +318,7 @@
 		if (rle == NULL)
 			return (NULL);
 		if (rle->res != NULL) {
-			/* XXX panic? */
-			printf("%s: resource entry is busy\n", __func__);
-			return (NULL);
+			panic("%s: resource entry is busy", __func__);
 		}
 		start = rle->start;
 		end = rle->end;
@@ -371,7 +364,6 @@
 	/*
 	 * If this is a memory resource, track the direct mapping
 	 * in the uncached MIPS KSEG1 segment.
-	 * XXX is this correct?
 	 */
 	if (type == SYS_RES_MEMORY) {
 		void *vaddr;