aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2005-04-12 20:26:05 +0000
committerRalf Baechle <ralf@linux-mips.org>2005-10-29 19:31:04 +0100
commit05b8042ac6d35383c2fcc171ed932426c4e09ed1 (patch)
tree39d056bbbd8c1658d227ea9973098847768c14ff /arch
parent6dd04688520d7abe4883b2a79fa720291d76b140 (diff)
downloadlinux-05b8042ac6d35383c2fcc171ed932426c4e09ed1.tar.gz
Fix one more case of computing the return EPC after the registers have
already been modified. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/kernel/traps.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 77f796b9975e60..94d9141c04c17e 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -447,9 +447,9 @@ static inline void simulate_sc(struct pt_regs *regs, unsigned int opcode)
preempt_disable();
if (ll_bit == 0 || ll_task != current) {
+ compute_return_epc(regs);
regs->regs[reg] = 0;
preempt_enable();
- compute_return_epc(regs);
return;
}