From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 7 Jul 2006 23:07:40 +0000 (+0200)
Subject: [MIPS] NUMA: Register all nodes before cpus or sysfs will barf.
X-Git-Tag: v2.6.19-rc2~214
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e8f8f54c1537d22eb0168622a5f6aef4040da6a;p=linux-2.6

[MIPS] NUMA: Register all nodes before cpus or sysfs will barf.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index 221895802d..1af3612a1c 100644
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -467,14 +467,18 @@ static DEFINE_PER_CPU(struct cpu, cpu_devices);
 
 static int __init topology_init(void)
 {
-	int cpu;
-	int ret;
+	int i, ret;
 
-	for_each_present_cpu(cpu) {
-		ret = register_cpu(&per_cpu(cpu_devices, cpu), cpu);
+#ifdef CONFIG_NUMA
+	for_each_online_node(i)
+		register_one_node(i);
+#endif /* CONFIG_NUMA */
+
+	for_each_present_cpu(i) {
+		ret = register_cpu(&per_cpu(cpu_devices, i), i);
 		if (ret)
 			printk(KERN_WARNING "topology_init: register_cpu %d "
-			       "failed (%d)\n", cpu, ret);
+			       "failed (%d)\n", i, ret);
 	}
 
 	return 0;