---

yaml --- r: 11063 b: refs/heads/master c: 05b8042 h: refs/heads/master i: 11061: c4aaa93 11059: 7d2f775 11055: c1549e6 v: v3
git-mirror · Oct 29, 2005 · 0ea2a4f · 0ea2a4f
1 parent a49091b
commit 0ea2a4f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6dd04688520d7abe4883b2a79fa720291d76b140
+refs/heads/master: 05b8042ac6d35383c2fcc171ed932426c4e09ed1
diff --git a/trunk/arch/mips/kernel/traps.c b/trunk/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;
 	}