Commit d1f0ece6 authored by Jonghwan Choi's avatar Jonghwan Choi Committed by Linus Torvalds

mm/memblock.c: small function definition fixes

warning: function 'memblock_memory_can_coalesce'
with external linkage has definition.
Signed-off-by: default avatarJonghwan Choi <jhbird.choi@samsung.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d2ebd0f6
...@@ -267,7 +267,7 @@ static int __init_memblock memblock_double_array(struct memblock_type *type) ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment