1 files changed, 11 insertions, 2 deletions

diff --git a/arch/x86_64/pci/k8-bus.c b/arch/x86_64/pci/k8-bus.c
index c2c38b579939..d80c323669e0 100644
--- a/arch/x86_64/pci/k8-bus.c
+++ b/arch/x86_64/pci/k8-bus.c
@@ -47,13 +47,22 @@ fill_mp_bus_to_cpumask(void)
                          * if there are no busses hanging off of the current
                          * ldt link then both the secondary and subordinate
                          * bus number fields are set to 0.
+                         * 
+                         * RED-PEN
+                         * This is slightly broken because it assumes
+                         * HT node IDs == Linux node ids, which is not always
+                         * true. However it is probably mostly true.
                          */
                         if (!(SECONDARY_LDT_BUS_NUMBER(ldtbus) == 0
                                 && SUBORDINATE_LDT_BUS_NUMBER(ldtbus) == 0)) {
                                 for (j = SECONDARY_LDT_BUS_NUMBER(ldtbus);
                                      j <= SUBORDINATE_LDT_BUS_NUMBER(ldtbus);
-                                     j++)
-                                        pci_bus_to_node[j] = NODE_ID(nid);
+                                     j++) { 
+                                        int node = NODE_ID(nid);
+                                        if (!node_online(node))
+                                                node = 0;
+                                        pci_bus_to_node[j] = node;
+                                }               
                         }
                 }
         }