From 2fc4eb321484076fc1ef8a20e0565470be52c533 Mon Sep 17 00:00:00 2001 From: David Daney Date: Mon, 26 Jul 2010 14:29:37 -0700 Subject: [PATCH] --- yaml --- r: 204596 b: refs/heads/master c: 0c2f4551df3880083e4733b5d928d2758b71162c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/mips/kernel/cpu-probe.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 120150b682ca..94c8146e8066 100644 --- 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 index 9b6633171a1f..b1b304ea2128 100644 --- 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)