CVS Update@linux-mips.org: linux

[ralf@linux-mips.org]

CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ralf@ftp.linux-mips.org 05/04/12 12:04:15

Modified files:
        arch/mips/kernel: traps.c 

Log message:
        When simulating ll/sc compute the return EPC before modifying the
        registers.

diff -urN linux/arch/mips/kernel/traps.c linux/arch/mips/kernel/traps.c
--- linux/arch/mips/kernel/traps.c      2005/03/01 21:20:47     1.210
+++ linux/arch/mips/kernel/traps.c      2005/04/12 11:04:15     1.211
@@ -408,9 +408,10 @@
 
        preempt_enable();
 
+       compute_return_epc(regs);
+
        regs->regs[(opcode & RT) >> 16] = value;
 
-       compute_return_epc(regs);
        return;
 
 sig:
@@ -459,9 +460,9 @@
                goto sig;
        }
 
+       compute_return_epc(regs);
        regs->regs[reg] = 1;
 
-       compute_return_epc(regs);
        return;
 
 sig: