|
@@ -267,7 +267,7 @@ static int __init_memblock memblock_double_array(struct memblock_type *type)
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
-extern int __init_memblock __weak memblock_memory_can_coalesce(phys_addr_t addr1, phys_addr_t size1,
|
|
|
|
|
|
+int __init_memblock __weak memblock_memory_can_coalesce(phys_addr_t addr1, phys_addr_t size1,
|
|
phys_addr_t addr2, phys_addr_t size2)
|
|
phys_addr_t addr2, phys_addr_t size2)
|
|
{
|
|
{
|
|
return 1;
|
|
return 1;
|