diff options
| author | James Hogan <jhogan@kernel.org> | 2017-11-01 23:20:23 +0000 |
|---|---|---|
| committer | James Hogan <jhogan@kernel.org> | 2017-11-01 23:23:00 +0000 |
| commit | 7e7bf0ec1a7cd4599941ae2c79c3039dc622853b (patch) | |
| tree | 3e8f1b0e06d2cf4cae901fa6c1542dfdc3fd1f1e /arch/mips/kernel/smp-cmp.c | |
| parent | 07ca043e6b79ec7741b4fa2e9b72312f1ecc2030 (diff) | |
| download | linux-stable-7e7bf0ec1a7cd4599941ae2c79c3039dc622853b.tar.gz linux-stable-7e7bf0ec1a7cd4599941ae2c79c3039dc622853b.tar.bz2 linux-stable-7e7bf0ec1a7cd4599941ae2c79c3039dc622853b.zip | |
MIPS: smp-cmp: Fix vpe_id build error
The smp-cmp build has been (further) broken since commit 856fbcee6099
("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: 856fbcee6099 ("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>
Diffstat (limited to 'arch/mips/kernel/smp-cmp.c')
| -rw-r--r-- | arch/mips/kernel/smp-cmp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/kernel/smp-cmp.c b/arch/mips/kernel/smp-cmp.c index 415e4d19f897..a2322009cac3 100644 --- a/arch/mips/kernel/smp-cmp.c +++ b/arch/mips/kernel/smp-cmp.c @@ -50,8 +50,8 @@ static void cmp_init_secondary(void) #ifdef CONFIG_MIPS_MT_SMP if (cpu_has_mipsmt) - c->vpe_id = (read_c0_tcbind() >> TCBIND_CURVPE_SHIFT) & - TCBIND_CURVPE; + cpu_set_vpe_id(c, (read_c0_tcbind() >> TCBIND_CURVPE_SHIFT) & + TCBIND_CURVPE); #endif } |