projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.10.108' into update
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
arch
/
mips
/
include
/
asm
/
branch.h
diff --git
a/arch/mips/include/asm/branch.h
b/arch/mips/include/asm/branch.h
index e28a3e0eb3cb6407b4ad6d6ac649e20a876ab69d..582d8b61ce5cbd6a9ec0cb5c6ecba6bf885dd6dd 100644
(file)
--- a/
arch/mips/include/asm/branch.h
+++ b/
arch/mips/include/asm/branch.h
@@
-44,10
+44,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;
}