From patchwork Fri Jun 11 23:06:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai X-Patchwork-Id: 105661 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o5BN96Se012124 for ; Fri, 11 Jun 2010 23:09:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755639Ab0FKXJE (ORCPT ); Fri, 11 Jun 2010 19:09:04 -0400 Received: from rcsinet10.oracle.com ([148.87.113.121]:61348 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755140Ab0FKXJD (ORCPT ); Fri, 11 Jun 2010 19:09:03 -0400 Received: from rcsinet15.oracle.com (rcsinet15.oracle.com [148.87.113.117]) by rcsinet10.oracle.com (Switch-3.4.2/Switch-3.4.1) with ESMTP id o5BN8JZD010830 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 11 Jun 2010 23:08:21 GMT Received: from acsmt353.oracle.com (acsmt353.oracle.com [141.146.40.153]) by rcsinet15.oracle.com (Switch-3.4.2/Switch-3.4.1) with ESMTP id o5BC3Ft1019588; Fri, 11 Jun 2010 23:08:18 GMT Received: from abhmt004.oracle.com by acsmt355.oracle.com with ESMTP id 340437231276297626; Fri, 11 Jun 2010 16:07:06 -0700 Received: from [10.6.76.26] (/10.6.76.26) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 11 Jun 2010 16:07:05 -0700 Message-ID: <4C12C189.50201@oracle.com> Date: Fri, 11 Jun 2010 16:06:49 -0700 From: Yinghai Lu User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.9) Gecko/20100317 SUSE/3.0.4-1.1.1 Thunderbird/3.0.4 MIME-Version: 1.0 To: Bjorn Helgaas , Graham Ramsey CC: Jesse Barnes , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, bugzilla-daemon@bugzilla.kernel.org, Myron Stowe , Robert Richter , Harald Welte , Joseph Chan Subject: Re: [Bug 16007] x86/pci Oops with CONFIG_SND_HDA_INTEL References: <4BF40014.30303@ntlworld.com> <201005201108.07040.bjorn.helgaas@hp.com> <201006021058.57361.bjorn.helgaas@hp.com> <201006111549.05164.bjorn.helgaas@hp.com> In-Reply-To: <201006111549.05164.bjorn.helgaas@hp.com> X-Auth-Type: Internal IP X-Source-IP: rcsinet15.oracle.com [148.87.113.117] X-CT-RefId: str=0001.0A090207.4C12C1E6.00E1:SCFMA4539811,ss=1,fgs=0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 11 Jun 2010 23:09:07 +0000 (UTC) Index: linux-2.6/arch/x86/pci/bus_numa.c =================================================================== --- linux-2.6.orig/arch/x86/pci/bus_numa.c +++ linux-2.6/arch/x86/pci/bus_numa.c @@ -22,7 +22,8 @@ void x86_pci_root_bus_res_quirks(struct return; for (i = 0; i < pci_root_num; i++) { - if (pci_root_info[i].bus_min == b->number) + if (pci_root_info[i].bus_min <= b->number && + pci_root_info[i].bus_max >= b->number) break; } @@ -37,6 +38,7 @@ void x86_pci_root_bus_res_quirks(struct for (j = 0; j < info->res_num; j++) { struct resource *res; struct resource *root; + struct resource *tmp; res = &info->res[j]; pci_bus_add_resource(b, res, 0); Index: linux-2.6/kernel/resource.c =================================================================== --- linux-2.6.orig/kernel/resource.c +++ linux-2.6/kernel/resource.c @@ -451,7 +451,7 @@ static struct resource * __insert_resour if (!first) return first; - if (first == parent) + if (first == parent || first == new) return first; if ((first->start > new->start) || (first->end < new->end))