From 0ea2a4f4b0298455beca12db6adf363fc8695879 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Tue, 12 Apr 2005 20:26:05 +0000
Subject: [PATCH] --- yaml --- r: 11063 b: refs/heads/master c:
 05b8042ac6d35383c2fcc171ed932426c4e09ed1 h: refs/heads/master i:   11061:
 c4aaa934d369e96e1930e9838033f6979b198f58   11059:
 7d2f775699a3c6d67aba8e816f1bf573b2b317fe   11055:
 c1549e61344f9841db6ad7c871d875a1e03ceb57 v: v3

---
 [refs]                         | 2 +-
 trunk/arch/mips/kernel/traps.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0d9bf802d5f7..6373f2fe69cd 100644
--- 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
index 77f796b9975e..94d9141c04c1 100644
--- 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;
 	}