summaryrefslogtreecommitdiff
path: root/arch/x86/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2014-01-24 11:54:51 -0700
committerBjorn Helgaas <bhelgaas@google.com>2014-02-03 10:38:40 -0700
commit6616dbdf6d967c704830586d5ead35c9767a8431 (patch)
treee0b8220ccbd4bf13ff76e5027148fbba06b3e283 /arch/x86/pci
parentafcf21c2beca6604dbdc24fed1624c2499a85e7d (diff)
x86/PCI: Use x86_pci_root_bus_node() instead of get_mp_bus_to_node()
This replaces all uses of get_mp_bus_to_node() with x86_pci_root_bus_node(). I think these uses are all on root buses, except possibly for blind probing, where NUMA node information is unimportant. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'arch/x86/pci')
-rw-r--r--arch/x86/pci/acpi.c2
-rw-r--r--arch/x86/pci/common.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index 4f25ec077552..3f42c5c05bf6 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -503,7 +503,7 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
set_mp_bus_to_node(busnum, node);
else
#endif
- node = get_mp_bus_to_node(busnum);
+ node = x86_pci_root_bus_node(busnum);
if (node != -1 && !node_online(node))
node = -1;
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 600e5925f1a4..f7d6800f10d1 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -467,7 +467,7 @@ void pcibios_scan_root(int busnum)
printk(KERN_ERR "PCI: OOM, skipping PCI bus %02x\n", busnum);
return;
}
- sd->node = get_mp_bus_to_node(busnum);
+ sd->node = x86_pci_root_bus_node(busnum);
x86_pci_root_bus_resources(busnum, &resources);
printk(KERN_DEBUG "PCI: Probing PCI hardware (bus %02x)\n", busnum);
bus = pci_scan_root_bus(NULL, busnum, &pci_root_ops, sd, &resources);