[SPARC64]: Fix sun4v mna winfixup handling.

We were clobbering a base register before we were done
using it.  Fix a comment typo while we're here.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/sparc64/kernel/sun4v_tlb_miss.S b/arch/sparc64/kernel/sun4v_tlb_miss.S
index 3eed8db968481deb2ab856eda9ac687fa78ff12b..ab23ddb7116e52dda47df59cef5533b32248de3b 100644 (file)
--- a/arch/sparc64/kernel/sun4v_tlb_miss.S
+++ b/arch/sparc64/kernel/sun4v_tlb_miss.S
@@ -18,7 +18,7 @@
 
        /* DEST = (VADDR >> 22)
         *
-        * Branch to ZERO_CTX_LABEL is context is zero.
+        * Branch to ZERO_CTX_LABEL if context is zero.
         */
 #define        COMPUTE_TAG_TARGET(DEST, VADDR, CTX, ZERO_CTX_LABEL) \
        srlx    VADDR, 22, DEST; \
@@ -314,10 +314,10 @@ sun4v_mna:
         nop
 
        SET_GL(1)
-       ldxa    [%g0] ASI_SCRATCHPAD, %g5
-       ldx     [%g5 + HV_FAULT_D_ADDR_OFFSET], %g5
+       ldxa    [%g0] ASI_SCRATCHPAD, %g2
+       ldx     [%g2 + HV_FAULT_D_ADDR_OFFSET], %g5
        mov     HV_FAULT_TYPE_UNALIGNED, %g3
-       ldx     [%g5 + HV_FAULT_D_CTX_OFFSET], %g4
+       ldx     [%g2 + HV_FAULT_D_CTX_OFFSET], %g4
        sllx    %g3, 16, %g3
        or      %g4, %g3, %g4
        ba,pt   %xcc, winfix_mna