Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8137341 authored by Becky Bruce's avatar Becky Bruce Committed by Kumar Gala
Browse files

powerpc/fsl_booke: Correct test for MMU_FTR_BIG_PHYS 



The code was looking for this in cpu_features, not mmu_features.  Fix this.

Signed-off-by: default avatarBecky Bruce <beckyb@kernel.crashing.org>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent e0f278ad

arch/powerpc/mm/fsl_booke_mmu.c

+2 −2
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ void loadcam_entry(int idx) 
	mtspr(SPRN_MAS2, TLBCAM[idx].MAS2);

	mtspr(SPRN_MAS3, TLBCAM[idx].MAS3);



	if (cur_cpu_spec->cpu_features & MMU_FTR_BIG_PHYS)

	if (mmu_has_feature(MMU_FTR_BIG_PHYS))

		mtspr(SPRN_MAS7, TLBCAM[idx].MAS7);



	asm volatile("isync;tlbwe;isync" : : : "memory");
@@ -152,7 +152,7 @@ static void settlbcam(int index, unsigned long virt, phys_addr_t phys, 


	TLBCAM[index].MAS3 = (phys & MAS3_RPN) | MAS3_SX | MAS3_SR;

	TLBCAM[index].MAS3 |= ((flags & _PAGE_RW) ? MAS3_SW : 0);

	if (cur_cpu_spec->cpu_features & MMU_FTR_BIG_PHYS)

	if (mmu_has_feature(MMU_FTR_BIG_PHYS))

		TLBCAM[index].MAS7 = (u64)phys >> 32;



#ifndef CONFIG_KGDB /* want user access for breakpoints */