Merge branch 'x86/numa' into x86/devel

Conflicts:

	arch/x86/Kconfig
	arch/x86/kernel/e820.c
	arch/x86/kernel/efi_64.c
	arch/x86/kernel/mpparse.c
	arch/x86/kernel/setup.c
	arch/x86/kernel/setup_32.c
	arch/x86/mm/init_64.c
	include/asm-x86/proto.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 11 insertions, 6 deletions

diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index 464279da49c4..4fa52d3dc848 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -171,8 +171,11 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int do
         if (node != -1)
                 set_mp_bus_to_node(busnum, node);
         else
-                node = get_mp_bus_to_node(busnum);
 #endif
+                node = get_mp_bus_to_node(busnum);
+
+        if (node != -1 && !node_online(node))
+                node = -1;
 
         /* Allocate per-root-bus (not per bus) arch-specific data.
          * TODO: leak; this memory is never freed.
@@ -204,14 +207,16 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int do
         if (!bus)
                 kfree(sd);
 
+        if (bus && node != -1) {
 #ifdef CONFIG_ACPI_NUMA
-        if (bus) {
-                if (pxm >= 0) {
+                if (pxm >= 0)
                         printk(KERN_DEBUG "bus %02x -> pxm %d -> node %d\n",
-                                busnum, pxm, pxm_to_node(pxm));
-                }
-        }
+                                busnum, pxm, node);
+#else
+                printk(KERN_DEBUG "bus %02x -> node %d\n",
+                        busnum, node);
 #endif
+        }
 
         if (bus && (pci_probe & PCI_USE__CRS))
                 get_current_resources(device, busnum, domain, bus);