FAILED: patch "[PATCH] MIPS: CPS: #ifdef on CONFIG_MIPS_MT_SMP rather than" failed to apply to 4.1-stable tree

PATCH [email protected] 1 participant 1 message Oct 17, 2015

Subsystems (2)

Stable branch MIPS

lore

Share & tools

lore

[email protected]

author maintainer

2015-10-17 23:23 UTC #0 lore raw

The patch below does not apply to the 4.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 7a63076d9a31a6c2073da45021eeb4f89d2a8b56 Mon Sep 17 00:00:00 2001

From: Paul Burton <[email protected]>
Date: Wed, 5 Aug 2015 15:42:38 -0700
Subject: [PATCH] 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 Paul Burton <[email protected]>

Cc Markos Chandras <[email protected]>

Cc James Hogan <[email protected]>

Cc <[email protected]> # 3.16+

Cc [email protected]

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

Signed-off-by Ralf Baechle <[email protected]>

arch/mips/kernel/cps-vec.S +4 -4

index 57642f56dffb..209ded16806b 100644
@@ -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