From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:59588 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756297AbdCHHOt (ORCPT ); Wed, 8 Mar 2017 02:14:49 -0500 Subject: Patch "MIPS: Handle microMIPS jumps in the same way as MIPS32/MIPS64 jumps" has been added to the 4.9-stable tree To: paul.burton@imgtec.com, gregkh@linuxfoundation.org, ralf@linux-mips.org, tung7970@gmail.com Cc: , From: Date: Wed, 08 Mar 2017 08:00:08 +0100 Message-ID: <148895640817785@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: Handle microMIPS jumps in the same way as MIPS32/MIPS64 jumps to the 4.9-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-handle-micromips-jumps-in-the-same-way-as-mips32-mips64-jumps.patch and it can be found in the queue-4.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 096a0de427ea333f56f0ee00328cff2a2731bcf1 Mon Sep 17 00:00:00 2001 From: Paul Burton Date: Mon, 7 Nov 2016 15:07:07 +0000 Subject: MIPS: Handle microMIPS jumps in the same way as MIPS32/MIPS64 jumps From: Paul Burton commit 096a0de427ea333f56f0ee00328cff2a2731bcf1 upstream. is_jump_ins() checks for plain jump ("j") instructions since commit e7438c4b893e ("MIPS: Fix sibling call handling in get_frame_info") but that commit didn't make the same change to the microMIPS code, leaving it inconsistent with the MIPS32/MIPS64 code. Handle the microMIPS encoding of the jump instruction too such that it behaves consistently. Signed-off-by: Paul Burton Fixes: e7438c4b893e ("MIPS: Fix sibling call handling in get_frame_info") Cc: Tony Wu Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/14533/ Signed-off-by: Ralf Baechle Signed-off-by: Greg Kroah-Hartman --- arch/mips/kernel/process.c | 2 ++ 1 file changed, 2 insertions(+) --- a/arch/mips/kernel/process.c +++ b/arch/mips/kernel/process.c @@ -293,6 +293,8 @@ static inline int is_jump_ins(union mips return 0; } + if (ip->j_format.opcode == mm_j32_op) + return 1; if (ip->j_format.opcode == mm_jal32_op) return 1; if (ip->r_format.opcode != mm_pool32a_op || Patches currently in stable-queue which might be from paul.burton@imgtec.com are queue-4.9/mips-calculate-micromips-ra-properly-when-unwinding-the-stack.patch queue-4.9/mips-fix-get_frame_info-handling-of-micromips-function-size.patch queue-4.9/mips-handle-micromips-jumps-in-the-same-way-as-mips32-mips64-jumps.patch queue-4.9/mips-fix-is_jump_ins-handling-of-16b-micromips-instructions.patch queue-4.9/mips-clear-isa-bit-correctly-in-get_frame_info.patch queue-4.9/mips-prevent-unaligned-accesses-during-stack-unwinding.patch