|
@@ -78,7 +78,7 @@ static int __init early_parse_mem(char *p)
|
|
|
return 1;
|
|
|
|
|
|
memory_limit = PAGE_ALIGN(memparse(p, &p));
|
|
|
- DBG("memory limit = 0x%llx\n", (unsigned long long)memory_limit);
|
|
|
+ DBG("memory limit = 0x%llx\n", memory_limit);
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
@@ -661,7 +661,7 @@ void __init early_init_devtree(void *params)
|
|
|
|
|
|
/* make sure we've parsed cmdline for mem= before this */
|
|
|
if (memory_limit)
|
|
|
- first_memblock_size = min(first_memblock_size, memory_limit);
|
|
|
+ first_memblock_size = min_t(u64, first_memblock_size, memory_limit);
|
|
|
setup_initial_memory_limit(memstart_addr, first_memblock_size);
|
|
|
/* Reserve MEMBLOCK regions used by kernel, initrd, dt, etc... */
|
|
|
memblock_reserve(PHYSICAL_START, __pa(klimit) - PHYSICAL_START);
|