PERFORCE change 94903 for review
John-Mark Gurney
jmg at FreeBSD.org
Mon Apr 10 05:50:28 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=94903
Change 94903 by jmg at 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);
More information about the p4-projects
mailing list