Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[sfrench/cifs-2.6.git] / arch / sparc64 / kernel / winfixup.S

diff --git a/arch/sparc64/kernel/winfixup.S b/arch/sparc64/kernel/winfixup.S
index aca2a98b930b0539d3d86708b1eea15768ddf0ad..a6b0863c27df48e12bfa656a83783fee6ecfa05c 100644 (file)
--- a/arch/sparc64/kernel/winfixup.S
+++ b/arch/sparc64/kernel/winfixup.S
@@ -32,7 +32,7 @@ fill_fixup:
         rd     %pc, %g7
        call    do_sparc64_fault
         add    %sp, PTREGS_OFF, %o0
-       ba,pt   %xcc, rtrap_clr_l6
+       ba,pt   %xcc, rtrap
         nop
 
        /* Be very careful about usage of the trap globals here.
@@ -100,7 +100,7 @@ spill_fixup_dax:
         rd     %pc, %g7
        call    do_sparc64_fault
         add    %sp, PTREGS_OFF, %o0
-       ba,a,pt %xcc, rtrap_clr_l6
+       ba,a,pt %xcc, rtrap
 
 winfix_mna:
        andn    %g3, 0x7f, %g3
@@ -115,18 +115,19 @@ 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
-       ba,a,pt %xcc, rtrap_clr_l6
-1:     call    mem_address_unaligned
+       mov     %l4, %o2
+       call    sun4v_do_mna
+        mov    %l5, %o1
+       ba,a,pt %xcc, rtrap
+1:     mov     %l4, %o1
+       mov     %l5, %o2
+       call    mem_address_unaligned
         nop
-       ba,a,pt %xcc, rtrap_clr_l6
+       ba,a,pt %xcc, rtrap
 
 winfix_dax:
        andn    %g3, 0x7f, %g3
@@ -149,7 +150,7 @@ fill_fixup_dax:
         add    %sp, PTREGS_OFF, %o0
        call    sun4v_data_access_exception
         nop
-       ba,a,pt %xcc, rtrap_clr_l6
+       ba,a,pt %xcc, rtrap
 1:     call    spitfire_data_access_exception
         nop
-       ba,a,pt %xcc, rtrap_clr_l6
+       ba,a,pt %xcc, rtrap