Author: raj
Date: Wed Jun 16 14:10:39 2010
New Revision: 209232
URL: http://svn.freebsd.org/changeset/base/209232
Log:
Move ARM nexus rman initialization to attach routine.
This fixes a panic, which started to trigger after r209129 cleanup.
Submitted by: Andrew Turner
Modified:
head/sys/arm/arm/nexus.c
Modified: head/sys/arm/arm/nexus.c
==============================================================================
--- head/sys/arm/arm/nexus.c Wed Jun 16 12:55:14 2010 (r209231)
+++ head/sys/arm/arm/nexus.c Wed Jun 16 14:10:39 2010 (r209232)
@@ -110,13 +110,6 @@ nexus_probe(device_t dev)
device_quiet(dev); /* suppress attach message for neatness */
- mem_rman.rm_start = 0;
- mem_rman.rm_end = ~0u;
- mem_rman.rm_type = RMAN_ARRAY;
- mem_rman.rm_descr = "I/O memory addresses";
- if (rman_init(&mem_rman) || rman_manage_region(&mem_rman, 0, ~0u))
- panic("nexus_probe mem_rman");
-
return (BUS_PROBE_DEFAULT);
}
@@ -144,6 +137,13 @@ static int
nexus_attach(device_t dev)
{
+ mem_rman.rm_start = 0;
+ mem_rman.rm_end = ~0u;
+ mem_rman.rm_type = RMAN_ARRAY;
+ mem_rman.rm_descr = "I/O memory addresses";
+ if (rman_init(&mem_rman) || rman_manage_region(&mem_rman, 0, ~0u))
+ panic("nexus_probe mem_rman");
+
/*
* First, deal with the children we know about already
*/
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
