| Message ID | 1271089310-17607-1-git-send-email-beckyb@kernel.crashing.org (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Commit | e8137341b1bb9bbdc29d9fd8980485ec7dcb4109 |
| Delegated to: | Kumar Gala |
| Headers | show |
On Apr 12, 2010, at 11:21 AM, Becky Bruce wrote: > The code was looking for this in cpu_features, not mmu_features. Fix this. > > Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org> > --- > Switched to mmu_has_feature..... > > arch/powerpc/mm/fsl_booke_mmu.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) applied to merge. - k
diff --git a/arch/powerpc/mm/fsl_booke_mmu.c b/arch/powerpc/mm/fsl_booke_mmu.c index c539472..3260fdf 100644 --- a/arch/powerpc/mm/fsl_booke_mmu.c +++ b/arch/powerpc/mm/fsl_booke_mmu.c @@ -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 */
The code was looking for this in cpu_features, not mmu_features. Fix this. Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org> --- Switched to mmu_has_feature..... arch/powerpc/mm/fsl_booke_mmu.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)