diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-01-31 12:24:00 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-01-31 12:24:00 -0500 |
| commit | 30716e07ef511ec7525c07eb1e8060ba8943c2a2 (patch) | |
| tree | eb6a47cae63d3587fa773cc5a16781eaa2c7810b /arch/sparc64 | |
| parent | 03c79cc56e4497cbd09d74a73c1bd0d1d9a8a16c (diff) | |
| parent | f56df2f4db6e4af87fb8e941cff69f4501a111df (diff) | |
Merge branch 'linus'
Diffstat (limited to 'arch/sparc64')
| -rw-r--r-- | arch/sparc64/kernel/sun4v_tlb_miss.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/sun4v_tlb_miss.S b/arch/sparc64/kernel/sun4v_tlb_miss.S index b731881224e8..9871dbb1ab42 100644 --- a/arch/sparc64/kernel/sun4v_tlb_miss.S +++ b/arch/sparc64/kernel/sun4v_tlb_miss.S | |||
| @@ -142,9 +142,9 @@ sun4v_dtlb_prot: | |||
| 142 | rdpr %tl, %g1 | 142 | rdpr %tl, %g1 |
| 143 | cmp %g1, 1 | 143 | cmp %g1, 1 |
| 144 | bgu,pn %xcc, winfix_trampoline | 144 | bgu,pn %xcc, winfix_trampoline |
| 145 | nop | ||
| 146 | ba,pt %xcc, sparc64_realfault_common | ||
| 147 | mov FAULT_CODE_DTLB | FAULT_CODE_WRITE, %g4 | 145 | mov FAULT_CODE_DTLB | FAULT_CODE_WRITE, %g4 |
| 146 | ba,pt %xcc, sparc64_realfault_common | ||
| 147 | nop | ||
| 148 | 148 | ||
| 149 | /* Called from trap table: | 149 | /* Called from trap table: |
| 150 | * %g4: vaddr | 150 | * %g4: vaddr |