diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-02-17 21:23:30 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-02-17 21:23:30 -0500 |
| commit | 3b7faeb49e7c35db857b595c389436994ab1275e (patch) | |
| tree | 973208eb935876ebed9f2baf262ed08351764752 /arch/powerpc/mm | |
| parent | 82a0a1cc8f94bc59e5919715bc03fc8353fa770d (diff) | |
| parent | 96a8bac5895a41b0fb05a6aa7c3fa1ea631a91fe (diff) | |
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, | |||
| 111 | unsigned int tsize, lz; | 111 | unsigned int tsize, lz; |
| 112 | 112 | ||
| 113 | asm ("cntlzw %0,%1" : "=r" (lz) : "r" (size)); | 113 | asm ("cntlzw %0,%1" : "=r" (lz) : "r" (size)); |
| 114 | tsize = (21 - lz) / 2; | 114 | tsize = 21 - lz; |
| 115 | 115 | ||
| 116 | #ifdef CONFIG_SMP | 116 | #ifdef CONFIG_SMP |
| 117 | if ((flags & _PAGE_NO_CACHE) == 0) | 117 | if ((flags & _PAGE_NO_CACHE) == 0) |
| @@ -218,7 +218,7 @@ adjust_total_lowmem(void) | |||
| 218 | p += sprintf(p, "0/"); | 218 | p += sprintf(p, "0/"); |
| 219 | p[-1] = '\0'; | 219 | p[-1] = '\0'; |
| 220 | 220 | ||
| 221 | pr_info("Memory CAM mapping: %s Mb, residual: %ldMb\n", buf, | 221 | pr_info("Memory CAM mapping: %s Mb, residual: %dMb\n", buf, |
| 222 | (total_lowmem - __max_low_memory) >> 20); | 222 | (unsigned int)((total_lowmem - __max_low_memory) >> 20)); |
| 223 | __initial_memory_limit_addr = memstart_addr + __max_low_memory; | 223 | __initial_memory_limit_addr = memstart_addr + __max_low_memory; |
| 224 | } | 224 | } |