mm/memblock.c: small function definition fixes
Jonghwan Choi [Tue, 1 Nov 2011 00:08:42 +0000 (17:08 -0700)]
warning: function 'memblock_memory_can_coalesce'
with external linkage has definition.

Signed-off-by: Jonghwan Choi <jhbird.choi@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

mm/memblock.c

index b7ed636..7d4f5c8 100644 (file)
@@ -267,7 +267,7 @@ static int __init_memblock memblock_double_array(struct memblock_type *type)
        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)
 {
        return 1;