---

yaml --- r: 204596 b: refs/heads/master c: 0c2f455 h: refs/heads/master v: v3
git-mirror · Aug 5, 2010 · 2fc4eb3 · 2fc4eb3
1 parent 6cb8a17
commit 2fc4eb3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa90c87297a1bebd8356e41d71518b37ada56583
+refs/heads/master: 0c2f4551df3880083e4733b5d928d2758b71162c
diff --git a/trunk/arch/mips/kernel/cpu-probe.c b/trunk/arch/mips/kernel/cpu-probe.c
@@ -761,6 +761,9 @@ static void __cpuinit decode_configs(struct cpuinfo_mips *c)
 		ok = decode_config4(c);
 
 	mips_probe_watch_registers(c);
+
+	if (cpu_has_mips_r2)
+		c->core = read_c0_ebase() & 0x3ff;
 }
 
 static inline void cpu_probe_mips(struct cpuinfo_mips *c, unsigned int cpu)