Skip to content

Commit

Permalink
MIPS: CPS: #ifdef on CONFIG_MIPS_MT_SMP rather than CONFIG_MIPS_MT
Browse files Browse the repository at this point in the history
The CONFIG_MIPS_MT symbol can be selected by CONFIG_MIPS_VPE_LOADER in
addition to CONFIG_MIPS_MT_SMP. We only want MT code in the CPS SMP boot
vector if we're using MT for SMP. Thus switch the config symbol we ifdef
against to CONFIG_MIPS_MT_SMP.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: Markos Chandras <markos.chandras@imgtec.com>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: <stable@vger.kernel.org> # 3.16+
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/10867/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Paul Burton authored and Ralf Baechle committed Sep 30, 2015
1 parent a5b0f6d commit 7a63076
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions arch/mips/kernel/cps-vec.S
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ LEAF(excep_ejtag)
END(excep_ejtag)

LEAF(mips_cps_core_init)
#ifdef CONFIG_MIPS_MT
#ifdef CONFIG_MIPS_MT_SMP
/* Check that the core implements the MT ASE */
has_mt t0, 3f

Expand Down Expand Up @@ -311,7 +311,7 @@ LEAF(mips_cps_boot_vpes)

/* Calculate this VPEs ID. If the core doesn't support MT use 0 */
li t9, 0
#ifdef CONFIG_MIPS_MT
#ifdef CONFIG_MIPS_MT_SMP
has_mt ta2, 1f

/* Find the number of VPEs present in the core */
Expand Down Expand Up @@ -339,7 +339,7 @@ LEAF(mips_cps_boot_vpes)
PTR_L ta3, COREBOOTCFG_VPECONFIG(t0)
PTR_ADDU v0, v0, ta3

#ifdef CONFIG_MIPS_MT
#ifdef CONFIG_MIPS_MT_SMP

/* If the core doesn't support MT then return */
bnez ta2, 1f
Expand Down Expand Up @@ -453,7 +453,7 @@ LEAF(mips_cps_boot_vpes)

2: .set pop

#endif /* CONFIG_MIPS_MT */
#endif /* CONFIG_MIPS_MT_SMP */

/* Return */
jr ra
Expand Down

0 comments on commit 7a63076

Please sign in to comment.