diff --git a/[refs] b/[refs] index ffc16219e34a..9fb733216101 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 264e56d8247ef6e31ed4386926cae86c61ddcb18 +refs/heads/master: 2d7d3eb2bad116e0d1b3b3930a923c55f6d0f70e diff --git a/trunk/mm/memblock.c b/trunk/mm/memblock.c index 7d4f5c8a96cb..84bec4969ed5 100644 --- a/trunk/mm/memblock.c +++ b/trunk/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;