diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2006-03-02 23:42:53 -0500 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-03-20 04:14:16 -0500 |
| commit | bcc28ee0bf390df0d81cc9dafe980faef6b2771a (patch) | |
| tree | 7dfed621399ef9f1bc65a949bf639994b6494485 /arch | |
| parent | c4f8ef77f941e7d89a52fad1fbe04d59397e2bd1 (diff) | |
[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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc64/kernel/sun4v_tlb_miss.S | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/sparc64/kernel/sun4v_tlb_miss.S b/arch/sparc64/kernel/sun4v_tlb_miss.S index 3eed8db96848..ab23ddb7116e 100644 --- a/arch/sparc64/kernel/sun4v_tlb_miss.S +++ b/arch/sparc64/kernel/sun4v_tlb_miss.S | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | 18 | ||
| 19 | /* DEST = (VADDR >> 22) | 19 | /* DEST = (VADDR >> 22) |
| 20 | * | 20 | * |
| 21 | * Branch to ZERO_CTX_LABEL is context is zero. | 21 | * Branch to ZERO_CTX_LABEL if context is zero. |
| 22 | */ | 22 | */ |
| 23 | #define COMPUTE_TAG_TARGET(DEST, VADDR, CTX, ZERO_CTX_LABEL) \ | 23 | #define COMPUTE_TAG_TARGET(DEST, VADDR, CTX, ZERO_CTX_LABEL) \ |
| 24 | srlx VADDR, 22, DEST; \ | 24 | srlx VADDR, 22, DEST; \ |
| @@ -314,10 +314,10 @@ sun4v_mna: | |||
| 314 | nop | 314 | nop |
| 315 | 315 | ||
| 316 | SET_GL(1) | 316 | SET_GL(1) |
| 317 | ldxa [%g0] ASI_SCRATCHPAD, %g5 | 317 | ldxa [%g0] ASI_SCRATCHPAD, %g2 |
| 318 | ldx [%g5 + HV_FAULT_D_ADDR_OFFSET], %g5 | 318 | ldx [%g2 + HV_FAULT_D_ADDR_OFFSET], %g5 |
| 319 | mov HV_FAULT_TYPE_UNALIGNED, %g3 | 319 | mov HV_FAULT_TYPE_UNALIGNED, %g3 |
| 320 | ldx [%g5 + HV_FAULT_D_CTX_OFFSET], %g4 | 320 | ldx [%g2 + HV_FAULT_D_CTX_OFFSET], %g4 |
| 321 | sllx %g3, 16, %g3 | 321 | sllx %g3, 16, %g3 |
| 322 | or %g4, %g3, %g4 | 322 | or %g4, %g3, %g4 |
| 323 | ba,pt %xcc, winfix_mna | 323 | ba,pt %xcc, winfix_mna |