diff options
| author | Matthew Wilcox <matthew@wil.cx> | 2009-04-16 19:31:10 (GMT) |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-04-22 20:57:36 (GMT) |
| commit | 0bb1be3e30bfc3e09fa0ff1e887ac7da4a16c3a2 (patch) | |
| tree | 997b7e0dd0579c3aed6337c9ae24106ccab163b7 | |
| parent | 044cd80942e47b9de0915b627902adf05c52377f (diff) | |
| download | linux-0bb1be3e30bfc3e09fa0ff1e887ac7da4a16c3a2.tar.xz | |
x86/PCI: Move set_pci_bus_resources_arch_default into arch/x86
Commit 30a18d6c3f1e774de656ebd8ff219d53e2ba4029 introduced a new
function to set the PCI bus resources. Unfortunately, neither the
author, nor the committers seemed to know that we already have somewhere
to do that -- pcibios_fixup_bus(). This patch moves the hook (used only
by the K8 code) into x86-specific code where it should have been in the
first place.
Cc: Yinghai Lu <yinghai.lu@sun.com>
Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
| -rw-r--r-- | arch/x86/pci/common.c | 7 | ||||
| -rw-r--r-- | drivers/pci/probe.c | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index 8c362b9..f80ece5 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c @@ -142,15 +142,20 @@ static void __devinit pcibios_fixup_device_resources(struct pci_dev *dev) } } +void __attribute__((weak)) set_pci_bus_resources_arch_default(struct pci_bus *b) +{ +} + /* * Called after each bus is probed, but before its children * are examined. */ -void __devinit pcibios_fixup_bus(struct pci_bus *b) +void __devinit pcibios_fixup_bus(struct pci_bus *b) { struct pci_dev *dev; + set_pci_bus_resources_arch_default(b); pci_read_bridge_bases(b); list_for_each_entry(dev, &b->devices, bus_list) pcibios_fixup_device_resources(dev); diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 8eb50df..e3c3e08 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1118,10 +1118,6 @@ unsigned int __devinit pci_scan_child_bus(struct pci_bus *bus) return max; } -void __attribute__((weak)) set_pci_bus_resources_arch_default(struct pci_bus *b) -{ -} - struct pci_bus * pci_create_bus(struct device *parent, int bus, struct pci_ops *ops, void *sysdata) { @@ -1180,8 +1176,6 @@ struct pci_bus * pci_create_bus(struct device *parent, b->resource[0] = &ioport_resource; b->resource[1] = &iomem_resource; - set_pci_bus_resources_arch_default(b); - return b; dev_create_file_err: |