diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-07-06 18:38:58 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-08-04 22:56:04 -0400 |
commit | 35a1f0bd07015dde66501b47cfb6ddc72ebe7346 (patch) | |
tree | 9bfa42fd86d8fc6a6971a3b6ffcd703cc056f944 /include/linux/memblock.h | |
parent | b693fffb189fbfe7e1e8317ce5838808be8666a0 (diff) |
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 776c7d945dcc..367dea6e95a0 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h | |||
@@ -46,8 +46,7 @@ extern long memblock_add(u64 base, u64 size); | |||
46 | extern long memblock_remove(u64 base, u64 size); | 46 | extern long memblock_remove(u64 base, u64 size); |
47 | extern long __init memblock_free(u64 base, u64 size); | 47 | extern long __init memblock_free(u64 base, u64 size); |
48 | extern long __init memblock_reserve(u64 base, u64 size); | 48 | extern long __init memblock_reserve(u64 base, u64 size); |
49 | extern u64 __init memblock_alloc_nid(u64 size, u64 align, int nid, | 49 | extern u64 __init memblock_alloc_nid(u64 size, u64 align, int nid); |
50 | u64 (*nid_range)(u64, u64, int *)); | ||
51 | extern u64 __init memblock_alloc(u64 size, u64 align); | 50 | extern u64 __init memblock_alloc(u64 size, u64 align); |
52 | extern u64 __init memblock_alloc_base(u64 size, | 51 | extern u64 __init memblock_alloc_base(u64 size, |
53 | u64, u64 max_addr); | 52 | u64, u64 max_addr); |
@@ -63,6 +62,10 @@ extern int memblock_is_region_reserved(u64 base, u64 size); | |||
63 | 62 | ||
64 | extern void memblock_dump_all(void); | 63 | extern void memblock_dump_all(void); |
65 | 64 | ||
65 | /* Provided by the architecture */ | ||
66 | extern u64 memblock_nid_range(u64 start, u64 end, int *nid); | ||
67 | |||
68 | |||
66 | /* | 69 | /* |
67 | * pfn conversion functions | 70 | * pfn conversion functions |
68 | * | 71 | * |