diff options
author | Matthew Wilcox <matthew@wil.cx> | 2009-04-16 15:31:10 -0400 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-04-22 16:57:36 -0400 |
commit | 0bb1be3e30bfc3e09fa0ff1e887ac7da4a16c3a2 (patch) | |
tree | 997b7e0dd0579c3aed6337c9ae24106ccab163b7 /arch/x86/pci | |
parent | 044cd80942e47b9de0915b627902adf05c52377f (diff) |
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/x86/pci')
-rw-r--r-- | arch/x86/pci/common.c | 7 |
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) | |||
142 | } | 142 | } |
143 | } | 143 | } |
144 | 144 | ||
145 | void __attribute__((weak)) set_pci_bus_resources_arch_default(struct pci_bus *b) | ||
146 | { | ||
147 | } | ||
148 | |||
145 | /* | 149 | /* |
146 | * Called after each bus is probed, but before its children | 150 | * Called after each bus is probed, but before its children |
147 | * are examined. | 151 | * are examined. |
148 | */ | 152 | */ |
149 | 153 | ||
150 | void __devinit pcibios_fixup_bus(struct pci_bus *b) | 154 | void __devinit pcibios_fixup_bus(struct pci_bus *b) |
151 | { | 155 | { |
152 | struct pci_dev *dev; | 156 | struct pci_dev *dev; |
153 | 157 | ||
158 | set_pci_bus_resources_arch_default(b); | ||
154 | pci_read_bridge_bases(b); | 159 | pci_read_bridge_bases(b); |
155 | list_for_each_entry(dev, &b->devices, bus_list) | 160 | list_for_each_entry(dev, &b->devices, bus_list) |
156 | pcibios_fixup_device_resources(dev); | 161 | pcibios_fixup_device_resources(dev); |