summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMatthew Wilcox <matthew@wil.cx>2009-04-16 13:31:10 -0600
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-04-22 13:57:36 -0700
commit0bb1be3e30bfc3e09fa0ff1e887ac7da4a16c3a2 (patch)
tree997b7e0dd0579c3aed6337c9ae24106ccab163b7 /arch
parent044cd80942e47b9de0915b627902adf05c52377f (diff)
downloadlinux-0bb1be3e30bfc3e09fa0ff1e887ac7da4a16c3a2.tar.gz
linux-0bb1be3e30bfc3e09fa0ff1e887ac7da4a16c3a2.tar.bz2
linux-0bb1be3e30bfc3e09fa0ff1e887ac7da4a16c3a2.zip
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/pci/common.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 8c362b96b644..f80ece51305d 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);