diff options
author | Myron Stowe <mstowe@redhat.com> | 2011-11-21 13:54:19 -0500 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2012-02-14 11:44:46 -0500 |
commit | 6535943fbf25c8e9419a6b20ca992633baa0bf99 (patch) | |
tree | ad7eab22b1a193b37a47b804f49451bd7405833d /arch/x86/pci | |
parent | 925845bd49c6de437dfab3bf8dc654ea3ae21d74 (diff) |
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/pci')
-rw-r--r-- | arch/x86/pci/i386.c | 4 |
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) | |||
261 | idx, r, disabled, pass); | 261 | idx, r, disabled, pass); |
262 | if (pci_claim_resource(dev, idx) < 0) { | 262 | if (pci_claim_resource(dev, idx) < 0) { |
263 | /* We'll assign a new address later */ | 263 | /* We'll assign a new address later */ |
264 | dev->fw_addr[idx] = r->start; | 264 | pcibios_save_fw_addr(dev, |
265 | idx, r->start); | ||
265 | r->end -= r->start; | 266 | r->end -= r->start; |
266 | r->start = 0; | 267 | r->start = 0; |
267 | } | 268 | } |
@@ -307,6 +308,7 @@ static int __init pcibios_assign_resources(void) | |||
307 | } | 308 | } |
308 | 309 | ||
309 | pci_assign_unassigned_resources(); | 310 | pci_assign_unassigned_resources(); |
311 | pcibios_fw_addr_list_del(); | ||
310 | 312 | ||
311 | return 0; | 313 | return 0; |
312 | } | 314 | } |