[PATCH 17/39] lmb: Add lmb_memory_size()
in [Kernel]
|
Prev: [PATCH 05/39] lmb: Seperate region array from lmb_region struct
Next: [PATCH 23/39] x86, lmb: Add x86 version of __lmb_find_area()
From: Yinghai Lu on 9 Apr 2010 02:20 It will return memory size in specified range according to lmb.memory.region Try to share some code with lmb_free_memory_size() by passing get_free to __lmb_memory_size(). Signed-off-by: Yinghai Lu <yinghai(a)kernel.org> --- include/linux/lmb.h | 1 + mm/lmb.c | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/include/linux/lmb.h b/include/linux/lmb.h index b874dc0..8332934 100644 --- a/include/linux/lmb.h +++ b/include/linux/lmb.h @@ -101,6 +101,7 @@ void lmb_register_active_regions(int nid, unsigned long start_pfn, unsigned long last_pfn); u64 lmb_hole_size(u64 start, u64 end); u64 lmb_free_memory_size(u64 addr, u64 limit); +u64 lmb_memory_size(u64 addr, u64 limit); #include <asm/lmb.h> diff --git a/mm/lmb.c b/mm/lmb.c index dccd539..feb3dfa 100644 --- a/mm/lmb.c +++ b/mm/lmb.c @@ -746,7 +746,7 @@ void __init lmb_to_bootmem(u64 start, u64 end) } #endif -u64 __init lmb_free_memory_size(u64 addr, u64 limit) +static u64 __init __lmb_memory_size(u64 addr, u64 limit, bool get_free) { int i, count; struct range *range; @@ -776,6 +776,10 @@ u64 __init lmb_free_memory_size(u64 addr, u64 limit) } subtract_range(range, count, 0, addr); subtract_range(range, count, limit, -1ULL); + + /* Subtract lmb.reserved.region in range ? */ + if (!get_free) + goto sort_and_count_them; for (i = 0; i < lmb.reserved.cnt; i++) { struct lmb_property *r = &lmb.reserved.region[i]; @@ -788,6 +792,8 @@ u64 __init lmb_free_memory_size(u64 addr, u64 limit) subtract_range(range, count, final_start, final_end); } + +sort_and_count_them: nr_range = clean_sort_range(range, count); free_size = 0; @@ -797,6 +803,16 @@ u64 __init lmb_free_memory_size(u64 addr, u64 limit) return free_size << PAGE_SHIFT; } +u64 __init lmb_free_memory_size(u64 addr, u64 limit) +{ + return __lmb_memory_size(addr, limit, true); +} + +u64 __init lmb_memory_size(u64 addr, u64 limit) +{ + return __lmb_memory_size(addr, limit, false); +} + u64 __init __weak __lmb_find_area(u64 ei_start, u64 ei_last, u64 start, u64 end, u64 size, u64 align) { -- 1.6.4.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |