aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/mips/kernel/cpu-probe.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index bd712c91f48b..6e8fb85ce7c3 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -23,6 +23,7 @@
23#include <asm/cpu-type.h> 23#include <asm/cpu-type.h>
24#include <asm/fpu.h> 24#include <asm/fpu.h>
25#include <asm/mipsregs.h> 25#include <asm/mipsregs.h>
26#include <asm/mipsmtregs.h>
26#include <asm/msa.h> 27#include <asm/msa.h>
27#include <asm/watch.h> 28#include <asm/watch.h>
28#include <asm/elf.h> 29#include <asm/elf.h>
@@ -421,8 +422,11 @@ static void decode_configs(struct cpuinfo_mips *c)
421 mips_probe_watch_registers(c); 422 mips_probe_watch_registers(c);
422 423
423#ifndef CONFIG_MIPS_CPS 424#ifndef CONFIG_MIPS_CPS
424 if (cpu_has_mips_r2) 425 if (cpu_has_mips_r2) {
425 c->core = read_c0_ebase() & 0x3ff; 426 c->core = read_c0_ebase() & 0x3ff;
427 if (cpu_has_mipsmt)
428 c->core >>= fls(core_nvpes()) - 1;
429 }
426#endif 430#endif
427} 431}
428 432