summaryrefslogtreecommitdiff
path: root/include/linux/memblock.h
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2011-07-12 11:15:54 +0200
committerH. Peter Anvin <hpa@linux.intel.com>2011-07-14 11:47:40 -0700
commited7b56a799cade11f458cd83e1150af54a66b7e8 (patch)
treef61cd8c07445d6a61e4cbf323c797038904db4c3 /include/linux/memblock.h
parenteb40c4c27f1722f058e4713ccfedebac577d5190 (diff)
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 'include/linux/memblock.h')
-rw-r--r--include/linux/memblock.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index 7400d029df48..aa5df9e11fff 100644
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -92,10 +92,6 @@ extern int memblock_is_region_reserved(phys_addr_t base, phys_addr_t size);
extern void memblock_dump_all(void);
-/* Provided by the architecture */
-extern int memblock_memory_can_coalesce(phys_addr_t addr1, phys_addr_t size1,
- phys_addr_t addr2, phys_addr_t size2);
-
/**
* memblock_set_current_limit - Set the current allocation limit to allow
* limiting allocations to what is currently