Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7ba2991 authored by Tony Breeds's avatar Tony Breeds Committed by Benjamin Herrenschmidt
Browse files

powerpc/mm: Fix output of total_ram. 



On 32bit platforms that support >= 4GB memory total_ram was truncated.
This creates a confusing printk:
	Top of RAM: 0x100000000, Total RAM: 0x0
Fix that:
	Top of RAM: 0x100000000, Total RAM: 0x100000000

Signed-off-by: default avatarTony Breeds <tony@bakeyournoodle.com>
Acked-by: default avatarJosh Boyer <jwboyer@linux.vnet.ibm.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 5d8c6658

arch/powerpc/mm/mem.c

+2 −2
Original line number Diff line number Diff line
@@ -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));