diff options
author | Paul Burton <paul.burton@imgtec.com> | 2016-11-07 15:07:07 +0000 |
---|---|---|
committer | Sasha Levin <alexander.levin@verizon.com> | 2017-05-15 23:16:06 -0400 |
commit | 88e4685b51d3a8d37e5fce2afd3f4a61e6e82c73 (patch) | |
tree | 4d3bebecc143fe2ea4f07b81639d22ab97b1efdf /arch | |
parent | a6c4b18bdb3ac5fdeaed939b1fa6c7683228c1db (diff) |
MIPS: Handle microMIPS jumps in the same way as MIPS32/MIPS64 jumps
[ Upstream commit 096a0de427ea333f56f0ee00328cff2a2731bcf1 ]
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 <paul.burton@imgtec.com>
Fixes: e7438c4b893e ("MIPS: Fix sibling call handling in get_frame_info")
Cc: Tony Wu <tung7970@gmail.com>
Cc: linux-mips@linux-mips.org
Cc: <stable@vger.kernel.org> # v3.10+
Patchwork: https://patchwork.linux-mips.org/patch/14533/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/mips/kernel/process.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c index 2f9fbeccadb7..fc537d1b649d 100644 --- a/arch/mips/kernel/process.c +++ b/arch/mips/kernel/process.c @@ -289,6 +289,8 @@ static inline int is_jump_ins(union mips_instruction *ip) 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 || |