On Fri, 2014-01-10 at 17:30 -0600, Scott Wood wrote: > From: Scott Wood <sc...@tyr.buserror.net> > > 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 <scottw...@freescale.com> > --- > v2: rebase
Ack. > arch/powerpc/mm/tlb_low_64e.S | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/arch/powerpc/mm/tlb_low_64e.S b/arch/powerpc/mm/tlb_low_64e.S > index 75f5d27..16250b1 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 _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
