From 7a78af7954283db95f0de05d91631d8ad5739a7d Mon Sep 17 00:00:00 2001 From: Tony Breeds Date: Mon, 4 Jul 2011 18:44:19 +0000 Subject: [PATCH] --- yaml --- r: 259155 b: refs/heads/master c: f7ba2991e9063fa8cf668ee57c08e2842ad04f11 h: refs/heads/master i: 259153: 11dbd95c06c584c22a31cf544bdba61f45208c7a 259151: a7c242d73d6cb9af024011ff00c82b2f21d65d89 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/mm/mem.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d06584cb18a0..c913697be365 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d8c665889e27e1b8989ca465166e8897dc302d1 +refs/heads/master: f7ba2991e9063fa8cf668ee57c08e2842ad04f11 diff --git a/trunk/arch/powerpc/mm/mem.c b/trunk/arch/powerpc/mm/mem.c index 457dc84154ba..c781bbcf7338 100644 --- a/trunk/arch/powerpc/mm/mem.c +++ b/trunk/arch/powerpc/mm/mem.c @@ -249,7 +249,7 @@ static int __init mark_nonram_nosave(void) */ void __init paging_init(void) { - unsigned long total_ram = memblock_phys_mem_size(); + unsigned long long total_ram = memblock_phys_mem_size(); phys_addr_t top_of_ram = memblock_end_of_DRAM(); unsigned long max_zone_pfns[MAX_NR_ZONES]; @@ -269,7 +269,7 @@ void __init paging_init(void) kmap_prot = PAGE_KERNEL; #endif /* CONFIG_HIGHMEM */ - printk(KERN_DEBUG "Top of RAM: 0x%llx, Total RAM: 0x%lx\n", + printk(KERN_DEBUG "Top of RAM: 0x%llx, Total RAM: 0x%llx\n", (unsigned long long)top_of_ram, total_ram); printk(KERN_DEBUG "Memory hole size: %ldMB\n", (long int)((top_of_ram - total_ram) >> 20));