diff options
author | Paul Burton <paul.burton@imgtec.com> | 2014-03-24 06:19:28 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2014-03-31 12:17:12 -0400 |
commit | f0cff5c86f7d3be0084eedbf449c3f47638e76f2 (patch) | |
tree | 9ac9b6428ba2011c6b7d1c1ac071681b35272c3d /arch/mips | |
parent | a809d46066d5171ed446d59a51cd1e57d99fcfc3 (diff) |
MIPS: smp-cmp: Remove incorrect core number probe
This probing is already done by decode_configs as part of cpu_probe, and
furthermore the implementation here was incorrect for any MT core with
a number of VPEs other than 2.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/6650/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/kernel/smp-cmp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/kernel/smp-cmp.c b/arch/mips/kernel/smp-cmp.c index 594660ed19dc..3ef55fb7ac03 100644 --- a/arch/mips/kernel/smp-cmp.c +++ b/arch/mips/kernel/smp-cmp.c | |||
@@ -41,7 +41,7 @@ | |||
41 | 41 | ||
42 | static void cmp_init_secondary(void) | 42 | static void cmp_init_secondary(void) |
43 | { | 43 | { |
44 | struct cpuinfo_mips *c = ¤t_cpu_data; | 44 | struct cpuinfo_mips *c __maybe_unused = ¤t_cpu_data; |
45 | 45 | ||
46 | /* Assume GIC is present */ | 46 | /* Assume GIC is present */ |
47 | change_c0_status(ST0_IM, STATUSF_IP3 | STATUSF_IP4 | STATUSF_IP6 | | 47 | change_c0_status(ST0_IM, STATUSF_IP3 | STATUSF_IP4 | STATUSF_IP6 | |
@@ -49,7 +49,6 @@ static void cmp_init_secondary(void) | |||
49 | 49 | ||
50 | /* Enable per-cpu interrupts: platform specific */ | 50 | /* Enable per-cpu interrupts: platform specific */ |
51 | 51 | ||
52 | c->core = (read_c0_ebase() >> 1) & 0x1ff; | ||
53 | #if defined(CONFIG_MIPS_MT_SMP) || defined(CONFIG_MIPS_MT_SMTC) | 52 | #if defined(CONFIG_MIPS_MT_SMP) || defined(CONFIG_MIPS_MT_SMTC) |
54 | if (cpu_has_mipsmt) | 53 | if (cpu_has_mipsmt) |
55 | c->vpe_id = (read_c0_tcbind() >> TCBIND_CURVPE_SHIFT) & | 54 | c->vpe_id = (read_c0_tcbind() >> TCBIND_CURVPE_SHIFT) & |