From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:40294 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751973AbbJQXgr (ORCPT ); Sat, 17 Oct 2015 19:36:47 -0400 Subject: Patch "MIPS: CPS: Don't include MT code in non-MT kernels." has been added to the 4.2-stable tree To: paul.burton@imgtec.com, gregkh@linuxfoundation.org, james.hogan@imgtec.com, markos.chandras@imgtec.com, ralf@linux-mips.org Cc: , From: Date: Sat, 17 Oct 2015 16:36:46 -0700 Message-ID: <14451250061879@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: 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 know about it. >>From a5b0f6db0e6cf6224e50f6585e9c8f0c2d38a8f8 Mon Sep 17 00:00:00 2001 From: Paul Burton Date: Wed, 5 Aug 2015 15:42:37 -0700 Subject: MIPS: CPS: Don't include MT code in non-MT kernels. From: Paul Burton 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. Signed-off-by: Paul Burton Cc: Markos Chandras Cc: James Hogan Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/10866/ Signed-off-by: Ralf Baechle Signed-off-by: Greg Kroah-Hartman --- arch/mips/kernel/cps-vec.S | 2 ++ 1 file changed, 2 insertions(+) --- a/arch/mips/kernel/cps-vec.S +++ b/arch/mips/kernel/cps-vec.S @@ -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 paul.burton@imgtec.com 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