diff options
| author |   Scott Wood <scott@tyr.buserror.net> | 2012-06-12 17:02:32 -0500 |
|---|---|---|
| committer |   Scott Wood <scottwood@freescale.com> | 2014-01-10 17:32:02 -0600 |
| commit | 1149e8a73ffea953d8d6615ee37bce820a3eaeb8 (patch) | |
| tree | 184be7fe372de2da0bb7a678e0edd8074db758a0 /arch/powerpc/mm/tlb_low_64e.S | |
| parent | powerpc: fix 8xx and 6xx final link failures (diff) | |
| download | linux-dev-1149e8a73ffea953d8d6615ee37bce820a3eaeb8.tar.xz linux-dev-1149e8a73ffea953d8d6615ee37bce820a3eaeb8.zip | |
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/mm/tlb_low_64e.S')
| -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 */ PPC_TLBSRX_DOT(0,R16) ldx r14,r14,r15 /* grab pgd entry */ - beq normal_tlb_miss_done /* tlb exists already, bail */ + beq tlb_miss_done_bolted /* tlb exists already, bail */ MMU_FTR_SECTION_ELSE ldx r14,r14,r15 /* grab pgd entry */ ALT_MMU_FTR_SECTION_END_IFSET(MMU_FTR_USE_TLBRSRV) @@ -192,6 +192,7 @@ ALT_MMU_FTR_SECTION_END_IFSET(MMU_FTR_USE_TLBRSRV) mtspr SPRN_MAS7_MAS3,r15 tlbwe +tlb_miss_done_bolted: TLB_MISS_STATS_X(MMSTAT_TLB_MISS_NORM_OK) tlb_epilog_bolted rfi |