diff --git a/[refs] b/[refs]
index c6e56ccc681a..533270d89d2a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5981a5f16ed8d648b7f44e4aa19cd25733518a3
+refs/heads/master: 7123a6cab02ebc5dca61d0e341267578b245f2f3
diff --git a/trunk/arch/c6x/kernel/setup.c b/trunk/arch/c6x/kernel/setup.c
index c126f0414be5..0c07921747f4 100644
--- a/trunk/arch/c6x/kernel/setup.c
+++ b/trunk/arch/c6x/kernel/setup.c
@@ -23,6 +23,7 @@
 #include <linux/delay.h>
 #include <linux/sched.h>
 #include <linux/clk.h>
+#include <linux/cpu.h>
 #include <linux/fs.h>
 #include <linux/of.h>
 
@@ -493,3 +494,17 @@ const struct seq_operations cpuinfo_op = {
 	c_next,
 	show_cpuinfo
 };
+
+static struct cpu cpu_devices[NR_CPUS];
+
+static int __init topology_init(void)
+{
+	int i;
+
+	for_each_present_cpu(i)
+		register_cpu(&cpu_devices[i], i);
+
+	return 0;
+}
+
+subsys_initcall(topology_init);