From owner-svn-src-all@FreeBSD.ORG Wed Jun 16 14:10:40 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2A22F106564A; Wed, 16 Jun 2010 14:10:40 +0000 (UTC) (envelope-from raj@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 19F068FC0C; Wed, 16 Jun 2010 14:10:40 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5GEAdMw022617; Wed, 16 Jun 2010 14:10:39 GMT (envelope-from raj@svn.freebsd.org) Received: (from raj@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5GEAdbI022616; Wed, 16 Jun 2010 14:10:39 GMT (envelope-from raj@svn.freebsd.org) Message-Id: <201006161410.o5GEAdbI022616@svn.freebsd.org> From: Rafal Jaworowski Date: Wed, 16 Jun 2010 14:10:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r209232 - head/sys/arm/arm X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2010 14:10:40 -0000 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 */