summaryrefslogtreecommitdiff
path: root/mm/memblock.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2011-07-12 09:15:54 (GMT)
committerH. Peter Anvin <hpa@linux.intel.com>2011-07-14 18:47:40 (GMT)
commited7b56a799cade11f458cd83e1150af54a66b7e8 (patch)
treef61cd8c07445d6a61e4cbf323c797038904db4c3 /mm/memblock.c
parenteb40c4c27f1722f058e4713ccfedebac577d5190 (diff)
downloadlinux-3.10-ed7b56a799cade11f458cd83e1150af54a66b7e8.zip
linux-3.10-ed7b56a799cade11f458cd83e1150af54a66b7e8.tar.gz
linux-3.10-ed7b56a799cade11f458cd83e1150af54a66b7e8.tar.bz2
memblock: Remove memblock_memory_can_coalesce()
Arch could implement memblock_memor_can_coalesce() to veto merging of adjacent or overlapping memblock regions; however, no arch did and any vetoing would trigger WARN_ON(). Memblock regions are supposed to deal with proper memory anyway. Remove the unused hook. Signed-off-by: Tejun Heo <tj@kernel.org> Link: http://lkml.kernel.org/r/1310462166-31469-2-git-send-email-tj@kernel.org Cc: Yinghai Lu <yinghai@kernel.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'mm/memblock.c')
-rw-r--r--mm/memblock.c29
1 files changed, 0 insertions, 29 deletions
diff --git a/mm/memblock.c b/mm/memblock.c
index a8edb42..bd3a3a9 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -251,12 +251,6 @@ 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,
- phys_addr_t addr2, phys_addr_t size2)
-{
- return 1;
-}
-
static long __init_memblock memblock_add_region(struct memblock_type *type,
phys_addr_t base, phys_addr_t size)
{
@@ -282,17 +276,6 @@ static long __init_memblock memblock_add_region(struct memblock_type *type,
* of a block.
*/
if (base < rgn->base && end >= rgn->base) {
- /* If we can't coalesce, create a new block */
- if (!memblock_memory_can_coalesce(base, size,
- rgn->base,
- rgn->size)) {
- /* Overlap & can't coalesce are mutually
- * exclusive, if you do that, be prepared
- * for trouble
- */
- WARN_ON(end != rgn->base);
- goto new_block;
- }
/* We extend the bottom of the block down to our
* base
*/
@@ -316,17 +299,6 @@ static long __init_memblock memblock_add_region(struct memblock_type *type,
* top of a block
*/
if (base <= rend && end >= rend) {
- /* If we can't coalesce, create a new block */
- if (!memblock_memory_can_coalesce(rgn->base,
- rgn->size,
- base, size)) {
- /* Overlap & can't coalesce are mutually
- * exclusive, if you do that, be prepared
- * for trouble
- */
- WARN_ON(rend != base);
- goto new_block;
- }
/* We adjust our base down to enclose the
* original block and destroy it. It will be
* part of our new allocation. Since we've
@@ -349,7 +321,6 @@ static long __init_memblock memblock_add_region(struct memblock_type *type,
return 0;
}
- new_block:
/* If we are out of space, we fail. It's too late to resize the array
* but then this shouldn't have happened in the first place.
*/