X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=mm%2Fmemblock.c;h=84bec4969ed5d3a27d9c6035da6e39ebf1dfdd18;hb=3542b854bc26e5f8e42e0eab4d7f7453b74a362d;hp=b7ed63633581ab58ba3ceff10ac72a2a897ef6e2;hpb=0a93ebef698b08ed04af0d7d913bab8aedfdc253;p=~andy%2Flinux

diff --git a/mm/memblock.c b/mm/memblock.c
index b7ed6363358..84bec4969ed 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -58,7 +58,8 @@ static unsigned long __init_memblock memblock_addrs_overlap(phys_addr_t base1, p
 	return ((base1 < (base2 + size2)) && (base2 < (base1 + size1)));
 }
 
-long __init_memblock memblock_overlaps_region(struct memblock_type *type, phys_addr_t base, phys_addr_t size)
+static long __init_memblock memblock_overlaps_region(struct memblock_type *type,
+					phys_addr_t base, phys_addr_t size)
 {
 	unsigned long i;
 
@@ -267,7 +268,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;