On Mon, May 27, 2013 at 8:55 PM, Yijing Wang <wangyijing@xxxxxxxxxx> wrote: > I separate this patch from patchset "Add hostbridge resource release to > support root bus hotplug in IA64", because it's a Separate issue. > > We should increase info->res_num before we checking pci_use_crs return > when pci=nocrs set. > > Signed-off-by: Yijing Wang <wangyijing@xxxxxxxxxx> > Cc: Yinghai Lu <yinghai@xxxxxxxxxx> > Cc: Jiang Liu <liuj97@xxxxxxxxx> > Cc: "Rafael J. Wysocki" <rafael.j.wysocki@xxxxxxxxx> > Cc: Feng Tang <feng.tang@xxxxxxxxx> > --- > arch/x86/pci/acpi.c | 7 ++----- > 1 files changed, 2 insertions(+), 5 deletions(-) Applied to pci/misc for v3.11, thanks! > diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c > index 3e72425..662dfdf 100644 > --- a/arch/x86/pci/acpi.c > +++ b/arch/x86/pci/acpi.c > @@ -324,14 +324,11 @@ setup_resource(struct acpi_resource *acpi_res, void *data) > res->start = start; > res->end = end; > info->res_offset[info->res_num] = addr.translation_offset; > + info->res_num++; > > - if (!pci_use_crs) { > + if (!pci_use_crs) > dev_printk(KERN_DEBUG, &info->bridge->dev, > "host bridge window %pR (ignored)\n", res); > - return AE_OK; > - } > - > - info->res_num++; > > return AE_OK; > } > -- > 1.7.1 > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-pci" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html