diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-02-18 03:23:30 +0100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-02-18 03:23:30 +0100 |
| commit | 3b7faeb49e7c35db857b595c389436994ab1275e (patch) | |
| tree | 973208eb935876ebed9f2baf262ed08351764752 /arch/powerpc/mm | |
| parent | Merge commit 'origin/master' into next (diff) | |
| parent | powerpc/fsl-booke: Fix compile warning (diff) | |
| download | linux-3b7faeb49e7c35db857b595c389436994ab1275e.tar.xz linux-3b7faeb49e7c35db857b595c389436994ab1275e.zip | |
Merge commit 'kumar/next' into next
Diffstat (limited to 'arch/powerpc/mm')
| -rw-r--r-- | arch/powerpc/mm/fsl_booke_mmu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/mm/fsl_booke_mmu.c b/arch/powerpc/mm/fsl_booke_mmu.c index 3d8cf01582f5..985b6c361ab4 100644 --- a/arch/powerpc/mm/fsl_booke_mmu.c +++ b/arch/powerpc/mm/fsl_booke_mmu.c @@ -111,7 +111,7 @@ void settlbcam(int index, unsigned long virt, phys_addr_t phys, unsigned int tsize, lz; asm ("cntlzw %0,%1" : "=r" (lz) : "r" (size)); - tsize = (21 - lz) / 2; + tsize = 21 - lz; #ifdef CONFIG_SMP if ((flags & _PAGE_NO_CACHE) == 0) @@ -218,7 +218,7 @@ adjust_total_lowmem(void) p += sprintf(p, "0/"); p[-1] = '\0'; - pr_info("Memory CAM mapping: %s Mb, residual: %ldMb\n", buf, - (total_lowmem - __max_low_memory) >> 20); + pr_info("Memory CAM mapping: %s Mb, residual: %dMb\n", buf, + (unsigned int)((total_lowmem - __max_low_memory) >> 20)); __initial_memory_limit_addr = memstart_addr + __max_low_memory; } |