Merge branch 'master' into upstream-fixes

1 files changed, 9 insertions, 5 deletions

diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index 221895802dca..1af3612a1ce8 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;