From 928a40a4ada03ad3a4d0ff04648b9bbd73b9622e Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sat, 9 Oct 2004 20:21:04 -0700 Subject: [PATCH] Use "request_resource()" to properly fix up PCI resource clashes. This is made possible by the previous resource allocation ordering patch. Now that we run the pre-existing PCI resource discovery _before_ ACPI resources have been added, we should not "insert" the resources into any existing tree. If they clash with existing resources, we should re-allocate them (later, when we have the full resource map). --- arch/i386/pci/i386.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/i386/pci/i386.c b/arch/i386/pci/i386.c index b171e22838d13..ec859ad0e7daf 100644 --- a/arch/i386/pci/i386.c +++ b/arch/i386/pci/i386.c @@ -142,7 +142,7 @@ static void __init pcibios_allocate_resources(int pass) DBG("PCI: Resource %08lx-%08lx (f=%lx, d=%d, p=%d)\n", r->start, r->end, r->flags, disabled, pass); pr = pci_find_parent_resource(dev, r); - if (!pr || insert_resource(pr, r) < 0) { + if (!pr || request_resource(pr, r) < 0) { printk(KERN_ERR "PCI: Cannot allocate resource region %d of device %s\n", idx, pci_name(dev)); /* We'll assign a new address later */ r->end -= r->start; -- 2.53.0