Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linvill...

[linux-2.6-omap-h63xx.git] / arch / sparc64 / kernel / winfixup.S

diff --git a/arch/sparc64/kernel/winfixup.S b/arch/sparc64/kernel/winfixup.S
index aca2a98b930b0539d3d86708b1eea15768ddf0ad..c4aa110a10e5c25882896b001df4a3e5f89fd771 100644 (file)
--- a/arch/sparc64/kernel/winfixup.S
+++ b/arch/sparc64/kernel/winfixup.S
@@ -115,16 +115,17 @@ fill_fixup_mna:
        ba,pt   %xcc, etrap
         rd     %pc, %g7
        sethi   %hi(tlb_type), %g1
-       mov     %l4, %o1
        lduw    [%g1 + %lo(tlb_type)], %g1
-       mov     %l5, %o2
        cmp     %g1, 3
        bne,pt  %icc, 1f
         add    %sp, PTREGS_OFF, %o0
-       call    sun4v_mna
-        nop
+       mov     %l4, %o2
+       call    sun4v_do_mna
+        mov    %l5, %o1
        ba,a,pt %xcc, rtrap_clr_l6
-1:     call    mem_address_unaligned
+1:     mov     %l4, %o1
+       mov     %l5, %o2
+       call    mem_address_unaligned
         nop
        ba,a,pt %xcc, rtrap_clr_l6