lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MIPS: CPS: #ifdef on CONFIG_MIPS_MT_SMP rather than CONFIG_MIPS_MT

Browse Source 
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>
This commit is contained in:
Paul Burton
2015-08-05 15:42:38 -07:00
committed by Ralf Baechle
parent a5b0f6db0e
commit 7a63076d9a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/mips/kernel/cps-vec.S
View File

@@ -224,7 +224,7 @@ LEAF(excep_ejtag)
END(excep_ejtag) END(excep_ejtag)
LEAF(mips_cps_core_init) LEAF(mips_cps_core_init)
#ifdef CONFIG_MIPS_MT #ifdef CONFIG_MIPS_MT_SMP
/* Check that the core implements the MT ASE */ /* Check that the core implements the MT ASE */
has_mt t0, 3f has_mt t0, 3f
@@ -311,7 +311,7 @@ LEAF(mips_cps_boot_vpes)
/* Calculate this VPEs ID. If the core doesn't support MT use 0 */ /* Calculate this VPEs ID. If the core doesn't support MT use 0 */
li t9, 0 li t9, 0
#ifdef CONFIG_MIPS_MT #ifdef CONFIG_MIPS_MT_SMP
has_mt ta2, 1f has_mt ta2, 1f
/* Find the number of VPEs present in the core */ /* Find the number of VPEs present in the core */
@@ -339,7 +339,7 @@ LEAF(mips_cps_boot_vpes)
PTR_L ta3, COREBOOTCFG_VPECONFIG(t0) PTR_L ta3, COREBOOTCFG_VPECONFIG(t0)
PTR_ADDU v0, v0, ta3 PTR_ADDU v0, v0, ta3
#ifdef CONFIG_MIPS_MT #ifdef CONFIG_MIPS_MT_SMP
/* If the core doesn't support MT then return */ /* If the core doesn't support MT then return */
bnez ta2, 1f bnez ta2, 1f
@@ -453,7 +453,7 @@ LEAF(mips_cps_boot_vpes)
2: .set pop 2: .set pop
#endif /* CONFIG_MIPS_MT */ #endif /* CONFIG_MIPS_MT_SMP */
/* Return */ /* Return */
jr ra jr ra