]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
MIPS: smp-cmp: Remove incorrect core number probe
authorPaul Burton <paul.burton@imgtec.com>
Mon, 24 Mar 2014 10:19:28 +0000 (10:19 +0000)
committerRalf Baechle <ralf@linux-mips.org>
Mon, 31 Mar 2014 16:17:12 +0000 (18:17 +0200)
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>
arch/mips/kernel/smp-cmp.c

index 594660ed19dcd431cec741239f51d23c786fa343..3ef55fb7ac036c7d52eb0766c3b7c5c4a687b02f 100644 (file)
@@ -41,7 +41,7 @@
 
 static void cmp_init_secondary(void)
 {
-       struct cpuinfo_mips *c = &current_cpu_data;
+       struct cpuinfo_mips *c __maybe_unused = &current_cpu_data;
 
        /* Assume GIC is present */
        change_c0_status(ST0_IM, STATUSF_IP3 | STATUSF_IP4 | STATUSF_IP6 |
@@ -49,7 +49,6 @@ static void cmp_init_secondary(void)
 
        /* Enable per-cpu interrupts: platform specific */
 
-       c->core = (read_c0_ebase() >> 1) & 0x1ff;
 #if defined(CONFIG_MIPS_MT_SMP) || defined(CONFIG_MIPS_MT_SMTC)
        if (cpu_has_mipsmt)
                c->vpe_id = (read_c0_tcbind() >> TCBIND_CURVPE_SHIFT) &