diff options
author | Scott Wood <scott@tyr.buserror.net> | 2012-06-12 18:02:32 -0400 |
---|---|---|
committer | Scott Wood <scottwood@freescale.com> | 2014-01-10 18:32:02 -0500 |
commit | 1149e8a73ffea953d8d6615ee37bce820a3eaeb8 (patch) | |
tree | 184be7fe372de2da0bb7a678e0edd8074db758a0 /arch/powerpc | |
parent | 78f3d050c34b690c0ac5f20e28a2f3906ef822d7 (diff) |
powerpc/booke-64: fix tlbsrx. path in bolted tlb handler
It was branching to the cleanup part of the non-bolted handler,
which would have been bad if there were any chips with tlbsrx.
that use the bolted handler.
Signed-off-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/mm/tlb_low_64e.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/mm/tlb_low_64e.S b/arch/powerpc/mm/tlb_low_64e.S index 75f5d2777f61..16250b162375 100644 --- a/arch/powerpc/mm/tlb_low_64e.S +++ b/arch/powerpc/mm/tlb_low_64e.S | |||
@@ -136,7 +136,7 @@ BEGIN_MMU_FTR_SECTION | |||
136 | */ | 136 | */ |
137 | PPC_TLBSRX_DOT(0,R16) | 137 | PPC_TLBSRX_DOT(0,R16) |
138 | ldx r14,r14,r15 /* grab pgd entry */ | 138 | ldx r14,r14,r15 /* grab pgd entry */ |
139 | beq normal_tlb_miss_done /* tlb exists already, bail */ | 139 | beq tlb_miss_done_bolted /* tlb exists already, bail */ |
140 | MMU_FTR_SECTION_ELSE | 140 | MMU_FTR_SECTION_ELSE |
141 | ldx r14,r14,r15 /* grab pgd entry */ | 141 | ldx r14,r14,r15 /* grab pgd entry */ |
142 | ALT_MMU_FTR_SECTION_END_IFSET(MMU_FTR_USE_TLBRSRV) | 142 | ALT_MMU_FTR_SECTION_END_IFSET(MMU_FTR_USE_TLBRSRV) |
@@ -192,6 +192,7 @@ ALT_MMU_FTR_SECTION_END_IFSET(MMU_FTR_USE_TLBRSRV) | |||
192 | mtspr SPRN_MAS7_MAS3,r15 | 192 | mtspr SPRN_MAS7_MAS3,r15 |
193 | tlbwe | 193 | tlbwe |
194 | 194 | ||
195 | tlb_miss_done_bolted: | ||
195 | TLB_MISS_STATS_X(MMSTAT_TLB_MISS_NORM_OK) | 196 | TLB_MISS_STATS_X(MMSTAT_TLB_MISS_NORM_OK) |
196 | tlb_epilog_bolted | 197 | tlb_epilog_bolted |
197 | rfi | 198 | rfi |