Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a63076d authored by Paul Burton's avatar Paul Burton Committed by Ralf Baechle
Browse files

MIPS: CPS: #ifdef on CONFIG_MIPS_MT_SMP rather than CONFIG_MIPS_MT 



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: default avatarPaul 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: default avatarRalf Baechle <ralf@linux-mips.org>
parent a5b0f6db

arch/mips/kernel/cps-vec.S

+4 −4
Original line number Diff line number Diff line
@@ -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
@@ -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 */
@@ -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
@@ -453,7 +453,7 @@ LEAF(mips_cps_boot_vpes) 


2:	.set	pop



#endif /* CONFIG_MIPS_MT */

#endif /* CONFIG_MIPS_MT_SMP */



	/* Return */

	jr	ra