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 21:25:34

Modified files:
        arch/mips64/kernel: Tag: linux_2_4 traps.c 
        arch/mips/kernel: Tag: linux_2_4 traps.c 

Log message:
        Fix one more case of computing the return EPC after the registers have
        already been modified.

diff -urN linux/arch/mips64/kernel/traps.c linux/arch/mips64/kernel/traps.c
--- linux/arch/mips64/kernel/Attic/traps.c      2005/04/12 11:03:17     
1.30.2.63
+++ linux/arch/mips64/kernel/Attic/traps.c      2005/04/12 20:25:34     
1.30.2.64
@@ -496,8 +496,8 @@
                goto sig;
        }
        if (ll_bit == 0 || ll_task != current) {
-               regs->regs[reg] = 0;
                compute_return_epc(regs);
+               regs->regs[reg] = 0;
                return;
        }
 
diff -urN linux/arch/mips/kernel/traps.c linux/arch/mips/kernel/traps.c
--- linux/arch/mips/kernel/traps.c      2005/04/12 11:03:17     1.99.2.69
+++ linux/arch/mips/kernel/traps.c      2005/04/12 20:25:34     1.99.2.70
@@ -486,8 +486,8 @@
                goto sig;
        }
        if (ll_bit == 0 || ll_task != current) {
-               regs->regs[reg] = 0;
                compute_return_epc(regs);
+               regs->regs[reg] = 0;
                return;
        }