diff options
author | Paul Burton <paul.burton@imgtec.com> | 2016-11-07 10:07:07 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2017-01-03 10:34:37 -0500 |
commit | 096a0de427ea333f56f0ee00328cff2a2731bcf1 (patch) | |
tree | 84c8ca5e375b7edd44eabad80a6c5c2624d798d2 /arch/mips/kernel/process.c | |
parent | bb9bc4689b9c635714fbcd5d335bad9934a7ebfc (diff) |
MIPS: Handle microMIPS jumps in the same way as MIPS32/MIPS64 jumps
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>
Diffstat (limited to 'arch/mips/kernel/process.c')
-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 801b399d4861..efa1df52c616 100644 --- a/arch/mips/kernel/process.c +++ b/arch/mips/kernel/process.c | |||
@@ -294,6 +294,8 @@ static inline int is_jump_ins(union mips_instruction *ip) | |||
294 | return 0; | 294 | return 0; |
295 | } | 295 | } |
296 | 296 | ||
297 | if (ip->j_format.opcode == mm_j32_op) | ||
298 | return 1; | ||
297 | if (ip->j_format.opcode == mm_jal32_op) | 299 | if (ip->j_format.opcode == mm_jal32_op) |
298 | return 1; | 300 | return 1; |
299 | if (ip->r_format.opcode != mm_pool32a_op || | 301 | if (ip->r_format.opcode != mm_pool32a_op || |