From 57a59869bc95f1fb2179227627456691d2e158f3 Mon Sep 17 00:00:00 2001 From: Becky Bruce Date: Thu, 21 Aug 2008 13:50:22 -0500 Subject: [PATCH] --- yaml --- r: 114546 b: refs/heads/master c: 82331ab15f14786f3d8e874efb76462685e3bfa0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/mm/fsl_booke_mmu.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a31664923534..1d48e858dd1e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 307db95882fdfba372a0639e8e238cf8c542f430 +refs/heads/master: 82331ab15f14786f3d8e874efb76462685e3bfa0 diff --git a/trunk/arch/powerpc/mm/fsl_booke_mmu.c b/trunk/arch/powerpc/mm/fsl_booke_mmu.c index ce10e2b1b902..23cee39534fd 100644 --- a/trunk/arch/powerpc/mm/fsl_booke_mmu.c +++ b/trunk/arch/powerpc/mm/fsl_booke_mmu.c @@ -202,7 +202,7 @@ adjust_total_lowmem(void) cam_max_size = max_lowmem_size; /* adjust lowmem size to max_lowmem_size */ - ram = min(max_lowmem_size, (phys_addr_t)total_lowmem); + ram = min(max_lowmem_size, total_lowmem); /* Calculate CAM values */ __cam0 = 1UL << 2 * (__ilog2(ram) / 2); @@ -225,7 +225,8 @@ adjust_total_lowmem(void) printk(KERN_INFO "Memory CAM mapping: CAM0=%ldMb, CAM1=%ldMb," " CAM2=%ldMb residual: %ldMb\n", __cam0 >> 20, __cam1 >> 20, __cam2 >> 20, - (total_lowmem - __cam0 - __cam1 - __cam2) >> 20); + (long int)((total_lowmem - __cam0 - __cam1 - __cam2) + >> 20)); __max_low_memory = __cam0 + __cam1 + __cam2; __initial_memory_limit_addr = memstart_addr + __max_low_memory; }