[PATCH 10/23] x86, lmb: Add lmb_x86_to_bootmem()
in [Kernel]
|
Prev: [PATCH 03/23] lmb: Print new doubled array location info
Next: [PATCH 12/23] x86, lmb: Add get_free_all_memory_range()
From: Yinghai Lu on 4 Jul 2010 03:10 lmb_x86_to_bootmem() will reserve lmb.reserved.region in bootmem after bootmem is set up. We can use it to with all arches that support lmb later. Signed-off-by: Yinghai Lu <yinghai(a)kernel.org> --- arch/x86/include/asm/lmb.h | 1 + arch/x86/mm/lmb.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/arch/x86/include/asm/lmb.h b/arch/x86/include/asm/lmb.h index b29e8dc..4a1b299 100644 --- a/arch/x86/include/asm/lmb.h +++ b/arch/x86/include/asm/lmb.h @@ -4,5 +4,6 @@ #define ARCH_DISCARD_LMB u64 lmb_x86_find_in_range_size(u64 start, u64 *sizep, u64 align); +void lmb_x86_to_bootmem(u64 start, u64 end); #endif diff --git a/arch/x86/mm/lmb.c b/arch/x86/mm/lmb.c index 8e20dda..61b292f 100644 --- a/arch/x86/mm/lmb.c +++ b/arch/x86/mm/lmb.c @@ -86,3 +86,33 @@ u64 __init lmb_x86_find_in_range_size(u64 start, u64 *sizep, u64 align) return LMB_ERROR; } +#ifndef CONFIG_NO_BOOTMEM +void __init lmb_x86_to_bootmem(u64 start, u64 end) +{ + int count; + u64 final_start, final_end; + struct lmb_region *r; + + /* Take out region array itself */ + if (lmb.reserved.regions != lmb_reserved_init_regions) + lmb_free(__pa(lmb.reserved.regions), sizeof(struct lmb_region) * lmb.reserved.max); + + count = lmb.reserved.cnt; + pr_info("(%d early reservations) ==> bootmem [%010llx - %010llx]\n", count, start, end); + for_each_lmb(reserved, r) { + pr_info(" [%010llx - %010llx] ", (u64)r->base, (u64)r->base + r->size); + final_start = max(start, r->base); + final_end = min(end, r->base + r->size); + if (final_start >= final_end) { + pr_cont("\n"); + continue; + } + pr_cont(" ==> [%010llx - %010llx]\n", final_start, final_end); + reserve_bootmem_generic(final_start, final_end - final_start, BOOTMEM_DEFAULT); + } + + /* Put region array back ? */ + if (lmb.reserved.regions != lmb_reserved_init_regions) + lmb_reserve(__pa(lmb.reserved.regions), sizeof(struct lmb_region) * lmb.reserved.max); +} +#endif -- 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/ |