diff --git a/[refs] b/[refs] index 3d98e3b1cfdd..ec654678dc48 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 236260b90dd94516982ad67aa6f5449c4c37db7b +refs/heads/master: cd79481d27b9f90aad80c9b972292c42c25bbf8e diff --git a/trunk/mm/memblock.c b/trunk/mm/memblock.c index ae8b06c828c7..400dc62697d7 100644 --- a/trunk/mm/memblock.c +++ b/trunk/mm/memblock.c @@ -99,7 +99,7 @@ long __init_memblock memblock_overlaps_region(struct memblock_type *type, phys_a * are top-down. */ -static phys_addr_t __init memblock_find_region(phys_addr_t start, phys_addr_t end, +static phys_addr_t __init_memblock memblock_find_region(phys_addr_t start, phys_addr_t end, phys_addr_t size, phys_addr_t align) { phys_addr_t base, res_base; @@ -653,7 +653,7 @@ void __init memblock_enforce_memory_limit(phys_addr_t memory_limit) } } -static int memblock_search(struct memblock_type *type, phys_addr_t addr) +static int __init_memblock memblock_search(struct memblock_type *type, phys_addr_t addr) { unsigned int left = 0, right = type->cnt;