diff options
| author | Jonghwan Choi <jhbird.choi@samsung.com> | 2011-10-31 17:08:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-31 17:30:48 -0700 |
| commit | d1f0ece6cdca973c01a46dff0eb062baafe78a85 (patch) | |
| tree | 570aabe98bb19454723c122cee74fa42cbfa49c9 /mm/memblock.c | |
| parent | d2ebd0f6b89567eb93ead4e2ca0cbe03021f344b (diff) | |
| download | op-kernel-dev-d1f0ece6cdca973c01a46dff0eb062baafe78a85.zip op-kernel-dev-d1f0ece6cdca973c01a46dff0eb062baafe78a85.tar.gz | |
mm/memblock.c: small function definition fixes
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>
Diffstat (limited to 'mm/memblock.c')
| -rw-r--r-- | mm/memblock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memblock.c b/mm/memblock.c index b7ed636..7d4f5c8 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; |
