Prev: [PATCH 21/23] x86: Remove not used early_res code
Next: [PATCH 07/23] lmb: Add lmb_find_in_range()
From: Yinghai Lu on 4 Jul 2010 03:10
It will return memory size in specified range according to lmb.memory.region

Try to share some code with lmb_x86_free_memory_in_range() by passing get_free to
__lmb_x86_memory_in_range().

-v2: Ben want _in_range in the name instead of size

Signed-off-by: Yinghai Lu <yinghai(a)kernel.org>
---
arch/x86/include/asm/lmb.h | 1 +
arch/x86/mm/lmb.c | 18 +++++++++++++++++-
2 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/arch/x86/include/asm/lmb.h b/arch/x86/include/asm/lmb.h
index 3202090..8114713 100644
--- a/arch/x86/include/asm/lmb.h
+++ b/arch/x86/include/asm/lmb.h
@@ -16,5 +16,6 @@ void lmb_x86_register_active_regions(int nid, unsigned long start_pfn,
u64 lmb_x86_hole_size(u64 start, u64 end);
u64 lmb_x86_find_in_range_node(int nid, u64 start, u64 end, u64 size, u64 align);
u64 lmb_x86_free_memory_in_range(u64 addr, u64 limit);
+u64 lmb_x86_memory_in_range(u64 addr, u64 limit);

#endif
diff --git a/arch/x86/mm/lmb.c b/arch/x86/mm/lmb.c
index e6b0fd5..2dfc523 100644
--- a/arch/x86/mm/lmb.c
+++ b/arch/x86/mm/lmb.c
@@ -217,7 +217,7 @@ void __init lmb_x86_to_bootmem(u64 start, u64 end)
}
#endif

-u64 __init lmb_x86_free_memory_in_range(u64 addr, u64 limit)
+static u64 __init __lmb_x86_memory_in_range(u64 addr, u64 limit, bool get_free)
{
int i, count;
struct range *range;
@@ -246,6 +246,10 @@ u64 __init lmb_x86_free_memory_in_range(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_each_lmb(reserved, r) {
final_start = PFN_DOWN(r->base);
final_end = PFN_UP(r->base + r->size);
@@ -256,6 +260,8 @@ u64 __init lmb_x86_free_memory_in_range(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;
@@ -265,6 +271,16 @@ u64 __init lmb_x86_free_memory_in_range(u64 addr, u64 limit)
return free_size << PAGE_SHIFT;
}

+u64 __init lmb_x86_free_memory_in_range(u64 addr, u64 limit)
+{
+ return __lmb_x86_memory_in_range(addr, limit, true);
+}
+
+u64 __init lmb_x86_memory_in_range(u64 addr, u64 limit)
+{
+ return __lmb_x86_memory_in_range(addr, limit, false);
+}
+
void __init lmb_x86_reserve_range(u64 start, u64 end, char *name)
{
if (start == end)
--
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/
 | 
Pages: 1
Prev: [PATCH 21/23] x86: Remove not used early_res code
Next: [PATCH 07/23] lmb: Add lmb_find_in_range()