summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2010-07-28 15:38:40 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-08-05 12:56:34 +1000
commit5303b68f57c227c27193a14e57dd12be27cd670f (patch)
treea7a217f9e3385b2f721cc2ec7ef3413577264e08
parent10d0643988e976360eb3497dcafb55b393b8e480 (diff)
downloadlinux-3.10-5303b68f57c227c27193a14e57dd12be27cd670f.tar.gz
linux-3.10-5303b68f57c227c27193a14e57dd12be27cd670f.tar.bz2
linux-3.10-5303b68f57c227c27193a14e57dd12be27cd670f.zip
memblock: Add memblock_find_in_range()
This is a wrapper for memblock_find_base() using slightly different arguments (start,end instead of start,size for example) in order to make it easier to convert existing arch/x86 code. Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-rw-r--r--include/linux/memblock.h2
-rw-r--r--mm/memblock.c8
2 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index 3978e6a8e82..4df09bdcae4 100644
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -47,6 +47,8 @@ extern int memblock_can_resize;
#define memblock_dbg(fmt, ...) \
if (memblock_debug) printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
+u64 memblock_find_in_range(u64 start, u64 end, u64 size, u64 align);
+
extern void __init memblock_init(void);
extern void __init memblock_analyze(void);
extern long memblock_add(phys_addr_t base, phys_addr_t size);
diff --git a/mm/memblock.c b/mm/memblock.c
index a17faea37d4..b7ab10a2ef4 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -162,6 +162,14 @@ static phys_addr_t __init memblock_find_base(phys_addr_t size, phys_addr_t align
return MEMBLOCK_ERROR;
}
+/*
+ * Find a free area with specified alignment in a specific range.
+ */
+u64 __init_memblock memblock_find_in_range(u64 start, u64 end, u64 size, u64 align)
+{
+ return memblock_find_base(size, align, start, end);
+}
+
static void __init_memblock memblock_remove_region(struct memblock_type *type, unsigned long r)
{
unsigned long i;