diff options
author | Becky Bruce <beckyb@kernel.crashing.org> | 2010-04-12 12:21:50 -0400 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2010-04-20 00:12:44 -0400 |
commit | e8137341b1bb9bbdc29d9fd8980485ec7dcb4109 (patch) | |
tree | f4ed1bc7db8a75fa7ff03d0e6d2b070562bb3d7f | |
parent | e0f278adc29e8986531a51e5ed33db42e34bf952 (diff) |
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: Becky Bruce <beckyb@kernel.crashing.org>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
-rw-r--r-- | arch/powerpc/mm/fsl_booke_mmu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/mm/fsl_booke_mmu.c b/arch/powerpc/mm/fsl_booke_mmu.c index c5394728bf2e..3260fdfb95f2 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) | |||
116 | mtspr(SPRN_MAS2, TLBCAM[idx].MAS2); | 116 | mtspr(SPRN_MAS2, TLBCAM[idx].MAS2); |
117 | mtspr(SPRN_MAS3, TLBCAM[idx].MAS3); | 117 | mtspr(SPRN_MAS3, TLBCAM[idx].MAS3); |
118 | 118 | ||
119 | if (cur_cpu_spec->cpu_features & MMU_FTR_BIG_PHYS) | 119 | if (mmu_has_feature(MMU_FTR_BIG_PHYS)) |
120 | mtspr(SPRN_MAS7, TLBCAM[idx].MAS7); | 120 | mtspr(SPRN_MAS7, TLBCAM[idx].MAS7); |
121 | 121 | ||
122 | asm volatile("isync;tlbwe;isync" : : : "memory"); | 122 | asm volatile("isync;tlbwe;isync" : : : "memory"); |
@@ -152,7 +152,7 @@ static void settlbcam(int index, unsigned long virt, phys_addr_t phys, | |||
152 | 152 | ||
153 | TLBCAM[index].MAS3 = (phys & MAS3_RPN) | MAS3_SX | MAS3_SR; | 153 | TLBCAM[index].MAS3 = (phys & MAS3_RPN) | MAS3_SX | MAS3_SR; |
154 | TLBCAM[index].MAS3 |= ((flags & _PAGE_RW) ? MAS3_SW : 0); | 154 | TLBCAM[index].MAS3 |= ((flags & _PAGE_RW) ? MAS3_SW : 0); |
155 | if (cur_cpu_spec->cpu_features & MMU_FTR_BIG_PHYS) | 155 | if (mmu_has_feature(MMU_FTR_BIG_PHYS)) |
156 | TLBCAM[index].MAS7 = (u64)phys >> 32; | 156 | TLBCAM[index].MAS7 = (u64)phys >> 32; |
157 | 157 | ||
158 | #ifndef CONFIG_KGDB /* want user access for breakpoints */ | 158 | #ifndef CONFIG_KGDB /* want user access for breakpoints */ |