Skip to content

Commit 7e7bf0e

Browse files
committed
MIPS: smp-cmp: Fix vpe_id build error
The smp-cmp build has been (further) broken since commit 856fbce ("MIPS: Store core & VP IDs in GlobalNumber-style variable") in v4.14-rc1 like so: arch/mips/kernel/smp-cmp.c: In function ‘cmp_init_secondary’: arch/mips/kernel/smp-cmp.c:53:4: error: ‘struct cpuinfo_mips’ has no member named ‘vpe_id’ c->vpe_id = (read_c0_tcbind() >> TCBIND_CURVPE_SHIFT) & ^ Fix by replacing vpe_id with cpu_set_vpe_id(). Fixes: 856fbce ("MIPS: Store core & VP IDs in GlobalNumber-style variable") Signed-off-by: James Hogan <jhogan@kernel.org> Reviewed-by: Paul Burton <paul.burton@imgtec.com> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/17569/ Signed-off-by: James Hogan <jhogan@kernel.org>
1 parent 07ca043 commit 7e7bf0e

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

arch/mips/kernel/smp-cmp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ static void cmp_init_secondary(void)
5050

5151
#ifdef CONFIG_MIPS_MT_SMP
5252
if (cpu_has_mipsmt)
53-
c->vpe_id = (read_c0_tcbind() >> TCBIND_CURVPE_SHIFT) &
54-
TCBIND_CURVPE;
53+
cpu_set_vpe_id(c, (read_c0_tcbind() >> TCBIND_CURVPE_SHIFT) &
54+
TCBIND_CURVPE);
5555
#endif
5656
}
5757

0 commit comments

Comments
 (0)