1 files changed, 3 insertions, 2 deletions

diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index f9a6a5665559..77f796b9975e 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -408,9 +408,10 @@ static inline void simulate_ll(struct pt_regs *regs, unsigned int opcode)
 
         preempt_enable();
 
+        compute_return_epc(regs);
+
         regs->regs[(opcode & RT) >> 16] = value;
 
-        compute_return_epc(regs);
         return;
 
 sig:
@@ -459,9 +460,9 @@ static inline void simulate_sc(struct pt_regs *regs, unsigned int opcode)
                 goto sig;
         }
 
+        compute_return_epc(regs);
         regs->regs[reg] = 1;
 
-        compute_return_epc(regs);
         return;
 
 sig: