From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756931AbYLPAyU (ORCPT ); Mon, 15 Dec 2008 19:54:20 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751772AbYLPAyF (ORCPT ); Mon, 15 Dec 2008 19:54:05 -0500 Received: from outbound-mail-109.bluehost.com ([69.89.22.9]:51191 "HELO outbound-mail-109.bluehost.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1750736AbYLPAyE (ORCPT ); Mon, 15 Dec 2008 19:54:04 -0500 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=virtuousgeek.org; h=Received:From:To:Subject:Date:User-Agent:Cc:References:In-Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-Disposition:Message-Id:X-Identified-User; b=H6BoSGSIPB72ZIv/83Zp9bifk7hNUBQTxZoFQsEGU7U4DLsgw1//hCKSRAjG2RmdwTcf/ppICPJWZWxaVR0yD53Xz4dgqvnoYB/1zWuRNMYRztdHFX3N0rCdp0KTARaS; From: Jesse Barnes To: Linus Torvalds Subject: Re: PCI BAR mem resource allocation "regression" Date: Mon, 15 Dec 2008 16:53:58 -0800 User-Agent: KMail/1.10.1 (Linux/2.6.27.5-41.fc9.x86_64; KDE/4.1.2; x86_64; ; ) Cc: Alex Chiang , Matthew Wilcox , Justin Chen , Linux Kernel Mailing List References: <20081213000538.GC9947@ldl.fc.hp.com> <200812151204.21089.jbarnes@virtuousgeek.org> In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Disposition: inline Message-Id: <200812151653.59024.jbarnes@virtuousgeek.org> X-Identified-User: {642:box128.bluehost.com:virtuous:virtuousgeek.org} {sentby:smtp auth 75.111.27.49 authed with jbarnes@virtuousgeek.org} Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by alpha.home.local id mBG0sNi3022934 On Monday, December 15, 2008 4:25 pm Linus Torvalds wrote:> On Mon, 15 Dec 2008, Jesse Barnes wrote:> > I can put your patch in my -next branch if you think it would help (not> > that - next gets a ton of testing, but hey)...>> Better than nothing, I guess.>> We may end up back-porting it (since Chen confirms that it's not just a> warning, it actually affects functionality), but let's get it some testing> in -next first and then eventually in the merge window. So you might mark> it for attention for 'stable@kernel.org' as you commit it. I pushed it to my -next branch, though I forgot to add the stable@ cc and fix up the comments while I was there... I think I'll have to rebase anyway, so I'll take care of both of those when I do. Thanks,-- Jesse Barnes, Intel Open Source Technology Center commit d4e9908a08199fe4d728c68cc7c5ca2d827ae99fAuthor: Linus Torvalds Date: Sat Dec 13 17:37:57 2008 -0800 resource: revert parent nesting of identical ranges Revert the change that causes inverted resource nesting in the case of identical resource ranges. Initially introduced by d33b6fba2c4350651f3f61ff2ab858a2f116e9a4, this change was provided without a justification and seems to cause problems on some machines in the face of PCI hot plugging. The patch makes resources registered against an existing but identical range nest as children of the existing resource, rather than parents. Reported-by: Alex Chiang Tested-by: Alex Chiang Tested-by: Justin Chen Signed-off-by: Linus Torvalds Signed-off-by: Jesse Barnes diff --git a/kernel/resource.c b/kernel/resource.cindex c251b0f..741357f 100644--- a/kernel/resource.c+++ b/kernel/resource.c@@ -381,8 +381,6 @@ static struct resource * __insert_resource(struct resource *parent, struct resou if ((first->start > new->start) || (first->end < new->end)) break;- if ((first->start == new->start) && (first->end == new->end))- break; } for (next = first; ; next = next->sibling) {{.n++%ݶw{.n+{G{ayʇڙ,jfhz_(階ݢj"mG?&~iOzv^m ?I