aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2005-04-12 16:26:05 -0400
committerRalf Baechle <ralf@linux-mips.org>2005-10-29 14:31:04 -0400
commit05b8042ac6d35383c2fcc171ed932426c4e09ed1 (patch)
tree39d056bbbd8c1658d227ea9973098847768c14ff /arch/mips/kernel
parent6dd04688520d7abe4883b2a79fa720291d76b140 (diff)
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/mips/kernel')
-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 77f796b9975e..94d9141c04c1 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)
447 preempt_disable(); 447 preempt_disable();
448 448
449 if (ll_bit == 0 || ll_task != current) { 449 if (ll_bit == 0 || ll_task != current) {
450 compute_return_epc(regs);
450 regs->regs[reg] = 0; 451 regs->regs[reg] = 0;
451 preempt_enable(); 452 preempt_enable();
452 compute_return_epc(regs);
453 return; 453 return;
454 } 454 }
455 455