Messages in this thread Patch in this message | | | From | jhbird.choi@samsung ... | Subject | [PATCH] mm/memblock: small function definition fixes | Date | Fri, 29 Jul 2011 08:01:20 +0900 |
| |
From: Jonghwan Choi <jhbird.choi@samsung.com>
warning: function 'memblock_memory_can_coalesce' with external linkage has definition.
Signed-off-by: Jonghwan Choi <jhbird.choi@samsung.com> --- mm/memblock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/mm/memblock.c b/mm/memblock.c index ccbf973..3314cb4 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -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; -- 1.7.0
| |