[PATCH 07/35] x86, lmb: Add lmb_to_bootmem()
in [Kernel]
|
Prev: [PATCH 33/35] x86: Change e820_any_mapped() to __init
Next: [PATCH 08/35] x86,lmb: Add lmb_reserve_area/lmb_free_area
From: Yinghai Lu on 13 May 2010 20:30 lmb_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 | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/arch/x86/include/asm/lmb.h b/arch/x86/include/asm/lmb.h index aa3a66e..2f06714 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_find_area_size(u64 start, u64 *sizep, u64 align); +void lmb_to_bootmem(u64 start, u64 end); #endif diff --git a/arch/x86/mm/lmb.c b/arch/x86/mm/lmb.c index 9d26eed..37a05e2 100644 --- a/arch/x86/mm/lmb.c +++ b/arch/x86/mm/lmb.c @@ -86,3 +86,34 @@ u64 __init lmb_find_area_size(u64 start, u64 *sizep, u64 align) return LMB_ERROR; } +#ifndef CONFIG_NO_BOOTMEM +void __init lmb_to_bootmem(u64 start, u64 end) +{ + int i, count; + u64 final_start, final_end; + + /* 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 (i = 0; i < count; i++) { + struct lmb_region *r = &lmb.reserved.regions[i]; + pr_info(" #%d [%010llx - %010llx] ", i, (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); + } + /* Clear them to avoid misusing ? */ + memset(&lmb.reserved.regions[0], 0, sizeof(struct lmb_region) * lmb.reserved.max); + lmb.reserved.regions = NULL; + lmb.reserved.max = 0; + lmb.reserved.cnt = 0; +} +#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/ |