From patchwork Tue Oct 27 08:09:55 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Yinghai Lu <yinghai@kernel.org>
X-Patchwork-Id: 56060
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9R8D4m8003036
	for <patchwork-pci@patchwork.kernel.org>;
	Tue, 27 Oct 2009 08:13:05 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S932140AbZJ0IM2 (ORCPT
	<rfc822;patchwork-pci@patchwork.kernel.org>);
	Tue, 27 Oct 2009 04:12:28 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932123AbZJ0IMZ
	(ORCPT <rfc822; linux-pci-outgoing>);
	Tue, 27 Oct 2009 04:12:25 -0400
Received: from hera.kernel.org ([140.211.167.34]:38025 "EHLO hera.kernel.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S932135AbZJ0IMX (ORCPT <rfc822;linux-pci@vger.kernel.org>);
	Tue, 27 Oct 2009 04:12:23 -0400
Received: from [192.168.101.9] (adsl-75-36-253-177.dsl.pltn13.sbcglobal.net
	[75.36.253.177]) (authenticated bits=0)
	by hera.kernel.org (8.14.3/8.14.3) with ESMTP id n9R8ABqs010571
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Tue, 27 Oct 2009 08:10:12 GMT
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.95.2 at hera.kernel.org
Message-ID: <4AE6AAD3.8020700@kernel.org>
Date: Tue, 27 Oct 2009 01:09:55 -0700
From: Yinghai Lu <yinghai@kernel.org>
User-Agent: Thunderbird 2.0.0.23 (X11/20090817)
MIME-Version: 1.0
To: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>,
	Jesse Barnes <jbarnes@virtuousgeek.org>, Alex Chiang <achiang@hp.com>
CC: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"linux-pci@vger.kernel.org" <linux-pci@vger.kernel.org>,
	Ivan Kokshaysky <ink@jurassic.park.msu.ru>,
	Bjorn Helgaas <bjorn.helgaas@hp.com>,
	"Eric W. Biederman" <ebiederm@xmission.com>, Ingo Molnar <mingo@elte.hu>
Subject: [PATCH 2/4] pci: revert "get larger bridge ranges when space is
	available"
References: <4ADEB601.8020200@kernel.org> <4AE52B68.3070501@jp.fujitsu.com>
	<4AE53883.3070709@kernel.org> <4AE5545E.1020900@jp.fujitsu.com>
	<4AE55D72.7080202@kernel.org> <4AE6A9CA.4060106@kernel.org>
In-Reply-To: <4AE6A9CA.4060106@kernel.org>
Sender: linux-pci-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-pci.vger.kernel.org>
X-Mailing-List: linux-pci@vger.kernel.org


Index: linux-2.6/drivers/pci/setup-bus.c
===================================================================
--- linux-2.6.orig/drivers/pci/setup-bus.c
+++ linux-2.6/drivers/pci/setup-bus.c
@@ -334,17 +334,8 @@ static struct resource *find_free_bus_re
 		r = bus->resource[i];
 		if (r == &ioport_resource || r == &iomem_resource)
 			continue;
-		if (r && (r->flags & type_mask) == type) {
-			if (!r->parent)
-				return r;
-			/*
-			 * if there is no child under that, we should release
-			 * and use it. don't need to reset it, pbus_size_* will
-			 * set it again
-			 */
-			if (!r->child && !release_resource(r))
-				return r;
-		}
+		if (r && (r->flags & type_mask) == type && !r->parent)
+			return r;
 	}
 	return NULL;
 }