2013-10-08 16:17:47

by Aaron Sierra

[permalink] [raw]
Subject: [PATCH 1/2] powerpc/fsl-booke: Allow use of all CAMs

CONFIG_LOWMEM_CAM_NUM was unnecessarily restricted to one fewer than
NUM_TLBCAMS. However, all comparisons to CONFIG_LOWMEM_CAM_NUM are
"less than" tests, so comparing 0-based CAM indexes to the maximum
number of CAMs is safe.

Signed-off-by: Aaron Sierra <[email protected]>
---
arch/powerpc/mm/fsl_booke_mmu.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/mm/fsl_booke_mmu.c b/arch/powerpc/mm/fsl_booke_mmu.c
index 07ba45b..92685d8 100644
--- a/arch/powerpc/mm/fsl_booke_mmu.c
+++ b/arch/powerpc/mm/fsl_booke_mmu.c
@@ -197,8 +197,8 @@ unsigned long map_mem_in_cams(unsigned long ram, int max_cam_idx)

#ifdef CONFIG_PPC32

-#if defined(CONFIG_LOWMEM_CAM_NUM_BOOL) && (CONFIG_LOWMEM_CAM_NUM >= NUM_TLBCAMS)
-#error "LOWMEM_CAM_NUM must be less than NUM_TLBCAMS"
+#if defined(CONFIG_LOWMEM_CAM_NUM_BOOL) && (CONFIG_LOWMEM_CAM_NUM > NUM_TLBCAMS)
+#error "LOWMEM_CAM_NUM must not exceed NUM_TLBCAMS"
#endif

unsigned long __init mmu_mapin_ram(unsigned long top)
--
1.7.9.5