diff options
| author | David S. Miller <davem@davemloft.net> | 2017-07-21 05:38:43 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-07-21 05:38:43 +0300 |
| commit | 7a68ada6ec7d88c68057d3a4c2a517eb94289976 (patch) | |
| tree | 51cd586e74fc92bfbdf382fa1544a235d908b25c /arch/mips/include/asm/branch.h | |
| parent | 760446f967678e14ee1b6464ee1bb8562f299fa6 (diff) | |
| parent | 96080f697786e0a30006fcbcc5b53f350fcb3e9f (diff) | |
| download | linux-7a68ada6ec7d88c68057d3a4c2a517eb94289976.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/mips/include/asm/branch.h')
| -rw-r--r-- | arch/mips/include/asm/branch.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/mips/include/asm/branch.h b/arch/mips/include/asm/branch.h index de781cf54bc7..da80878f2c0d 100644 --- a/arch/mips/include/asm/branch.h +++ b/arch/mips/include/asm/branch.h @@ -74,10 +74,7 @@ static inline int compute_return_epc(struct pt_regs *regs) return __microMIPS_compute_return_epc(regs); if (cpu_has_mips16) return __MIPS16e_compute_return_epc(regs); - return regs->cp0_epc; - } - - if (!delay_slot(regs)) { + } else if (!delay_slot(regs)) { regs->cp0_epc += 4; return 0; } |