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>

diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index 4f25ec0775526f45133d9087bc13fd4f76dfb24e..3f42c5c05bf6b703aa415cd24cf1f0178b5a2d10 100644 (file)
--- 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 600e5925f1a40a3fbb2868ee06422bd478d0386c..f7d6800f10d138c3ee358bb330e9ce5485ffa552 100644 (file)
--- 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);