aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBecky Bruce <becky.bruce@freescale.com>2008-08-21 14:50:22 -0400
committerKumar Gala <galak@kernel.crashing.org>2008-09-16 11:01:35 -0400
commit82331ab15f14786f3d8e874efb76462685e3bfa0 (patch)
tree649f2a8cf6cbb66b1e93d97d3097df5a68f27111
parent307db95882fdfba372a0639e8e238cf8c542f430 (diff)
powerpc/85xx: fix build warning, remove silly cast
This fixes a build warning when PHYS_64BIT is enabled, and removes an unnecessary cast to phys_addr_t (the variable being cast is already a phys_addr_t) Signed-off-by: Becky Bruce <becky.bruce@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
-rw-r--r--arch/powerpc/mm/fsl_booke_mmu.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/mm/fsl_booke_mmu.c b/arch/powerpc/mm/fsl_booke_mmu.c
index ce10e2b1b902..23cee39534fd 100644
--- a/arch/powerpc/mm/fsl_booke_mmu.c
+++ b/arch/powerpc/mm/fsl_booke_mmu.c
@@ -202,7 +202,7 @@ adjust_total_lowmem(void)
202 cam_max_size = max_lowmem_size; 202 cam_max_size = max_lowmem_size;
203 203
204 /* adjust lowmem size to max_lowmem_size */ 204 /* adjust lowmem size to max_lowmem_size */
205 ram = min(max_lowmem_size, (phys_addr_t)total_lowmem); 205 ram = min(max_lowmem_size, total_lowmem);
206 206
207 /* Calculate CAM values */ 207 /* Calculate CAM values */
208 __cam0 = 1UL << 2 * (__ilog2(ram) / 2); 208 __cam0 = 1UL << 2 * (__ilog2(ram) / 2);
@@ -225,7 +225,8 @@ adjust_total_lowmem(void)
225 printk(KERN_INFO "Memory CAM mapping: CAM0=%ldMb, CAM1=%ldMb," 225 printk(KERN_INFO "Memory CAM mapping: CAM0=%ldMb, CAM1=%ldMb,"
226 " CAM2=%ldMb residual: %ldMb\n", 226 " CAM2=%ldMb residual: %ldMb\n",
227 __cam0 >> 20, __cam1 >> 20, __cam2 >> 20, 227 __cam0 >> 20, __cam1 >> 20, __cam2 >> 20,
228 (total_lowmem - __cam0 - __cam1 - __cam2) >> 20); 228 (long int)((total_lowmem - __cam0 - __cam1 - __cam2)
229 >> 20));
229 __max_low_memory = __cam0 + __cam1 + __cam2; 230 __max_low_memory = __cam0 + __cam1 + __cam2;
230 __initial_memory_limit_addr = memstart_addr + __max_low_memory; 231 __initial_memory_limit_addr = memstart_addr + __max_low_memory;
231} 232}