From owner-p4-projects@FreeBSD.ORG  Mon Feb  3 00:16:47 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id AF65380C; Mon,  3 Feb 2014 00:16:47 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id F37E070A
 for <perforce@freebsd.org>; Mon,  3 Feb 2014 00:16:39 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id DEA131533
 for <perforce@freebsd.org>; Mon,  3 Feb 2014 00:16:39 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id s12NL47S001523
 for <perforce@freebsd.org>; Sun, 2 Feb 2014 23:21:14 GMT
 (envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.7/Submit) id s1122IGG054805
 for perforce@freebsd.org; Sat, 1 Feb 2014 02:02:18 GMT
 (envelope-from jhb@freebsd.org)
Date: Sat, 1 Feb 2014 02:02:18 GMT
Message-Id: <201402010202.s1122IGG054805@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 1190515 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.17
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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, 03 Feb 2014 00:16:47 -0000

http://p4web.freebsd.org/@@1190515?ac=10

Change 1190515 by jhb@jhb_pippin on 2014/02/01 02:02:13

	Compile.

Affected files ...

.. //depot/projects/pci/sys/dev/pci/pci_pci.c#46 edit

Differences ...

==== //depot/projects/pci/sys/dev/pci/pci_pci.c#46 (text+ko) ====

@@ -569,20 +569,20 @@
 	rid = 0;
 	bus->res = bus_alloc_resource(dev, PCI_RES_BUS, &rid, 0ul, ~0ul,
 	    min_count, 0);
-	if (bus_res == NULL) {
+	if (bus->res == NULL) {
 		/*
 		 * Fall back to just allocating a range of a single bus
 		 * number.
 		 */
 		bus->res = bus_alloc_resource(dev, PCI_RES_BUS, &rid, 0ul, ~0ul,
 		    1, 0);
-	} else if (rman_get_size(bus_res) < min_count)
+	} else if (rman_get_size(bus->res) < min_count)
 		/*
 		 * Attempt to grow the existing range to satisfy the
 		 * minimum desired count.
 		 */
-		(void)bus_adjust_resource(dev, PCI_RES_BUS, bus_res,
-		    rman_get_start(bus_res), rman_get_start(bus_res) +
+		(void)bus_adjust_resource(dev, PCI_RES_BUS, bus->res,
+		    rman_get_start(bus->res), rman_get_start(bus->res) +
 		    min_count - 1);
 
 	/* XXX */