diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-07-06 15:38:58 -0700 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-08-05 12:56:04 +1000 |
| commit | 35a1f0bd07015dde66501b47cfb6ddc72ebe7346 (patch) | |
| tree | 9bfa42fd86d8fc6a6971a3b6ffcd703cc056f944 /include/linux/memblock.h | |
| parent | b693fffb189fbfe7e1e8317ce5838808be8666a0 (diff) | |
| download | linux-3.10-35a1f0bd07015dde66501b47cfb6ddc72ebe7346.tar.gz linux-3.10-35a1f0bd07015dde66501b47cfb6ddc72ebe7346.tar.bz2 linux-3.10-35a1f0bd07015dde66501b47cfb6ddc72ebe7346.zip | |
memblock: Remove nid_range argument, arch provides memblock_nid_range() instead
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'include/linux/memblock.h')
| -rw-r--r-- | include/linux/memblock.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 776c7d945dc..367dea6e95a 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -46,8 +46,7 @@ extern long memblock_add(u64 base, u64 size); extern long memblock_remove(u64 base, u64 size); extern long __init memblock_free(u64 base, u64 size); extern long __init memblock_reserve(u64 base, u64 size); -extern u64 __init memblock_alloc_nid(u64 size, u64 align, int nid, - u64 (*nid_range)(u64, u64, int *)); +extern u64 __init memblock_alloc_nid(u64 size, u64 align, int nid); extern u64 __init memblock_alloc(u64 size, u64 align); extern u64 __init memblock_alloc_base(u64 size, u64, u64 max_addr); @@ -63,6 +62,10 @@ extern int memblock_is_region_reserved(u64 base, u64 size); extern void memblock_dump_all(void); +/* Provided by the architecture */ +extern u64 memblock_nid_range(u64 start, u64 end, int *nid); + + /* * pfn conversion functions * |