Merge branch 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek...

[mv-sheeva.git] / arch / mips / mm / tlbex-fault.S

diff --git a/arch/mips/mm/tlbex-fault.S b/arch/mips/mm/tlbex-fault.S
index 9e7f4175b4933504c2f8b2fc9586b7b073b19f68..e99eaa1fbedcc7e7cf54e3ba045382b95c708ad4 100644 (file)
--- a/arch/mips/mm/tlbex-fault.S
+++ b/arch/mips/mm/tlbex-fault.S
@@ -19,8 +19,8 @@
        move    a0, sp
        REG_S   a2, PT_BVADDR(sp)
        li      a1, \write
-       jal     do_page_fault
-       j       ret_from_exception
+       PTR_LA  ra, ret_from_exception
+       j       do_page_fault
        END(tlb_do_page_fault_\write)
        .endm