From owner-p4-projects@FreeBSD.ORG  Mon Apr 10 05:50:28 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 5EC7916A405; Mon, 10 Apr 2006 05:50:28 +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 3D00416A400
	for <perforce@freebsd.org>; Mon, 10 Apr 2006 05:50:28 +0000 (UTC)
	(envelope-from jmg@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 08B8E43D53
	for <perforce@freebsd.org>; Mon, 10 Apr 2006 05:50:28 +0000 (GMT)
	(envelope-from jmg@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3A5oRtY074091
	for <perforce@freebsd.org>; Mon, 10 Apr 2006 05:50:27 GMT
	(envelope-from jmg@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3A5oRPs074085
	for perforce@freebsd.org; Mon, 10 Apr 2006 05:50:27 GMT
	(envelope-from jmg@freebsd.org)
Date: Mon, 10 Apr 2006 05:50:27 GMT
Message-Id: <200604100550.k3A5oRPs074085@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmg@freebsd.org using -f
From: John-Mark Gurney <jmg@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 94903 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: Mon, 10 Apr 2006 05:50:28 -0000

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

Change 94903 by jmg@jmg_arlene on 2006/04/10 05:50:10

	make compile..

Affected files ...

.. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/nexus.c#8 edit

Differences ...

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

@@ -306,14 +306,14 @@
 	int error, cpuid;
 
 	ndi = device_get_ivars(child);
-	
+
 	if (res == NULL)
 		panic("%s: NULL interrupt resource!", __func__);
 
 	printf("dev=%s child=%s\n", ofw_bus_get_name(dev), ofw_bus_get_name(child));
 
 	ino = rman_get_start(res);
-       
+
 	printf("child=%s reg=0x%lx ino=0x%lx\n", ofw_bus_get_name(child),
 	       ndi->ndi_devhandle, ino);
 
@@ -339,7 +339,7 @@
 		error = ENXIO;
 		goto fail;
 	}
-	
+
 	if ((rman_get_flags(res) & RF_SHAREABLE) == 0)
 		flags |= INTR_EXCL;
 
@@ -407,6 +407,8 @@
 	struct rman *rm;
 	struct resource *rv;
 	struct resource_list_entry *rle;
+	struct nexus_devinfo *ndi;
+	device_t subord;
 	int isdefault, needactivate, passthrough;
 
 	isdefault = (start == 0UL && end == ~0UL);
@@ -432,9 +434,6 @@
 	switch (type) {
 	case SYS_RES_IRQ:
 		/* find the immediate subordinate */
-		struct nexus_devinfo *ndi;
-		device_t subord;
-
 		subord = child;
 		while (device_get_parent(subord) != bus)
 			subord = device_get_parent(subord);
@@ -582,7 +581,7 @@
 	ndi->ndi_intr_rman.rm_type = RMAN_ARRAY;
 	ndi->ndi_intr_rman.rm_descr = "Interrupts";
 	if (rman_init(&ndi->ndi_intr_rman) != 0 ||
-	    rman_manage_region(&ndi->ndi_intr_rman, 0, IV_MAX - 1) != 0 ||
+	    rman_manage_region(&ndi->ndi_intr_rman, 0, IV_MAX - 1) != 0)
 		panic("%s: failed to set up rmans.", __func__);
 
 	return (ndi);