diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-06-30 14:26:00 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-06-30 14:26:00 +0800 |
| commit | 267aa95e09eec438abf8979b58cded5cbc5586cb (patch) | |
| tree | 7401fc52691565f31c0ad96a94a7a54971cc6e6a /arch/mips/kernel/branch.c | |
| parent | d87abdcbf8871b5ee58083b3bdf216ba406224b9 (diff) | |
| parent | 6ee496d7218aeccffe5380cb65e9d50d1a61c323 (diff) | |
Merge tag 'v4.4.75' into linux-linaro-lsk-v4.4lsk-v4.4-17.06
This is the 4.4.75 stable release
Diffstat (limited to 'arch/mips/kernel/branch.c')
| -rw-r--r-- | arch/mips/kernel/branch.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/mips/kernel/branch.c b/arch/mips/kernel/branch.c index d8f9b357b222..e9fed8ca9b42 100644 --- a/arch/mips/kernel/branch.c +++ b/arch/mips/kernel/branch.c @@ -816,8 +816,10 @@ int __compute_return_epc_for_insn(struct pt_regs *regs, break; } /* Compact branch: BNEZC || JIALC */ - if (insn.i_format.rs) + if (!insn.i_format.rs) { + /* JIALC: set $31/ra */ regs->regs[31] = epc + 4; + } regs->cp0_epc += 8; break; #endif |