]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
powerpc/85xx: fix build warning, remove silly cast
authorBecky Bruce <becky.bruce@freescale.com>
Thu, 21 Aug 2008 18:50:22 +0000 (13:50 -0500)
committerKumar Gala <galak@kernel.crashing.org>
Tue, 16 Sep 2008 15:01:35 +0000 (10:01 -0500)
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>
arch/powerpc/mm/fsl_booke_mmu.c

index ce10e2b1b902e5ddba7abcd9f48489ef1f2f862e..23cee39534fddf8ab832658e6a3f0cb658cabec8 100644 (file)
@@ -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;
 }