From owner-svn-src-projects@FreeBSD.ORG Thu Dec 27 19:12:09 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C40C92E7; Thu, 27 Dec 2012 19:12:09 +0000 (UTC) (envelope-from gavin@FreeBSD.org) Received: from mail-gw13.york.ac.uk (mail-gw13.york.ac.uk [144.32.129.163]) by mx1.freebsd.org (Postfix) with ESMTP id 7EC548FC08; Thu, 27 Dec 2012 19:12:09 +0000 (UTC) Received: from ury.york.ac.uk ([144.32.108.81]:34640) by mail-gw13.york.ac.uk with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ToImz-0000Hk-Q3; Thu, 27 Dec 2012 19:06:45 +0000 Date: Thu, 27 Dec 2012 19:06:45 +0000 (GMT) From: Gavin Atkinson X-X-Sender: gavin@thunderhorn.york.ac.uk To: Aleksandr Rybalko Subject: Re: svn commit: r244668 - projects/efika_mx/sys/dev/fdt In-Reply-To: <201212242228.qBOMSrcd093127@svn.freebsd.org> Message-ID: References: <201212242228.qBOMSrcd093127@svn.freebsd.org> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Dec 2012 19:12:09 -0000 On Mon, 24 Dec 2012, Aleksandr Rybalko wrote: > Author: ray > Date: Mon Dec 24 22:28:52 2012 > New Revision: 244668 > URL: http://svnweb.freebsd.org/changeset/base/244668 > > Log: > Resources can be optional, so report lack of resource only if verbose. > > Sponsored by: FreeBSD Foundation > > Modified: > projects/efika_mx/sys/dev/fdt/simplebus.c > > Modified: projects/efika_mx/sys/dev/fdt/simplebus.c > ============================================================================== > --- projects/efika_mx/sys/dev/fdt/simplebus.c Mon Dec 24 22:26:03 2012 (r244667) > +++ projects/efika_mx/sys/dev/fdt/simplebus.c Mon Dec 24 22:28:52 2012 (r244668) > @@ -259,7 +259,7 @@ simplebus_alloc_resource(device_t bus, d > type = SYS_RES_MEMORY; > > rle = resource_list_find(&di->di_res, type, *rid); > - if (rle == NULL) { > + if (rle == NULL && bootverbose) { > device_printf(bus, "no default resources for " > "rid = %d, type = %d\n", *rid, type); > return (NULL); This appears to be wrong to me - before the code would return(NULL) if rle == NULL, whereas now both rle == NULL && bootverbose must be true to return. Later on, the code relies on rle being non-null, so will now presumably panic if !bootverbose. Gavin