From: Ralf Baechle <ralf@linux-mips.org>
Date: Tue, 12 Apr 2005 20:26:05 +0000 (+0000)
Subject: Fix one more case of computing the return EPC after the registers have
X-Git-Tag: v2.6.15-rc1~731^2~1^2~231
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05b8042ac6d35383c2fcc171ed932426c4e09ed1;p=linux-2.6

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>
---

diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 77f796b997..94d9141c04 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;
 	}