summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorMyron Stowe <mstowe@redhat.com>2011-11-21 11:54:19 -0700
committerJesse Barnes <jbarnes@virtuousgeek.org>2012-02-14 08:44:46 -0800
commit6535943fbf25c8e9419a6b20ca992633baa0bf99 (patch)
treead7eab22b1a193b37a47b804f49451bd7405833d /arch/x86
parent925845bd49c6de437dfab3bf8dc654ea3ae21d74 (diff)
downloadblackbird-op-linux-6535943fbf25c8e9419a6b20ca992633baa0bf99.tar.gz
blackbird-op-linux-6535943fbf25c8e9419a6b20ca992633baa0bf99.zip
x86/PCI: Convert maintaining FW-assigned BIOS BAR values to use a list
This patch converts the underlying maintenance aspects of FW-assigned BIOS BAR values from a statically allocated array within struct pci_dev to a list of temporary, stand alone, entries. Signed-off-by: Myron Stowe <myron.stowe@redhat.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/pci/i386.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
index 5a1edf2b5386..33e6a0b995fc 100644
--- a/arch/x86/pci/i386.c
+++ b/arch/x86/pci/i386.c
@@ -261,7 +261,8 @@ static void __init pcibios_allocate_resources(int pass)
idx, r, disabled, pass);
if (pci_claim_resource(dev, idx) < 0) {
/* We'll assign a new address later */
- dev->fw_addr[idx] = r->start;
+ pcibios_save_fw_addr(dev,
+ idx, r->start);
r->end -= r->start;
r->start = 0;
}
@@ -307,6 +308,7 @@ static int __init pcibios_assign_resources(void)
}
pci_assign_unassigned_resources();
+ pcibios_fw_addr_list_del();
return 0;
}
OpenPOWER on IntegriCloud