From 19b9f435c9c80f9b862dcce3fa7a19b07c3d60b5 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Tue, 23 Aug 2005 03:14:27 +0200
Subject: [PATCH] --- yaml --- r: 5983 b: refs/heads/master c:
 d3813fcf105814d06b47fa586f6b61f3cff1cefc h: refs/heads/master i:   5981:
 db12ff2ab9d84f1299e366d23cd0c029005a3f1b   5979:
 e9a1ffbbf377f9fbabc06ccf43e157bc242183de   5975:
 588b83b29f39bd550f014624f84247a9edaf2a40   5967:
 78e61a09131c754fcb43a0b226770c83f9028ce1   5951:
 7cbd96ec8a0948918503925001ac3128976443ef v: v3

---
 [refs]                         |  2 +-
 trunk/arch/x86_64/pci/k8-bus.c | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b2af15bc78bb..56995c82cb72 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2bbfb16bf345acd81ab1e6e3d4b35964650517ac
+refs/heads/master: d3813fcf105814d06b47fa586f6b61f3cff1cefc
diff --git a/trunk/arch/x86_64/pci/k8-bus.c b/trunk/arch/x86_64/pci/k8-bus.c
index c2c38b579939..d80c323669e0 100644
--- a/trunk/arch/x86_64/pci/k8-bus.c
+++ b/trunk/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;
+				}		
 			}
 		}
 	}