Patch "MIPS: CPS: Don't include MT code in non-MT kernels." has been added to the 4.2-stable tree

This is a note to let you know that I've just added the patch titled

MIPS: CPS: Don't include MT code in non-MT kernels.

to the 4.2-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
mips-cps-don-t-include-mt-code-in-non-mt-kernels.patch
and it can be found in the queue-4.2 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Paul Burton <[email protected]>
Date: Wed, 5 Aug 2015 15:42:37 -0700
Subject: MIPS: CPS: Don't include MT code in non-MT kernels.

From: Paul Burton <[email protected]>

commit a5b0f6db0e6cf6224e50f6585e9c8f0c2d38a8f8 upstream.

The MT-specific code in mips_cps_boot_vpes can safely be omitted from kernels which don't support MT, with the default VPE==0 case being used as it would be after the has_mt (Config3.MT) check failed at runtime. Discarding the code entirely will save us a few bytes & allow cleaner handling of MT ASE instructions by later patches.

Patchwork: https://patchwork.linux-mips.org/patch/10866/

---
 arch/mips/kernel/cps-vec.S |    2 ++
 1 file changed, 2 insertions(+)

@@ -311,6 +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
 	has_mt	ta2, 1f
 
 	/* Find the number of VPEs present in the core */

@@ -330,6 +331,7 @@ LEAF(mips_cps_boot_vpes)
 	/* Retrieve the VPE ID from EBase.CPUNum */
 	mfc0	t9, $15, 1
 	and	t9, t9, t1
+#endif
 
 1:	/* Calculate a pointer to this VPEs struct vpe_boot_config */
 	li	t1, VPEBOOTCFG_SIZE

Patches currently in stable-queue which might be from [email protected] are

queue-4.2/mips-cps-don-t-include-mt-code-in-non-mt-kernels.patch queue-4.2/mips-cps-ifdef-on-config_mips_mt_smp-rather-than-config_mips_mt.patch queue-4.2/mips-cps-stop-dangling-delay-slot-from-has_mt.patch