[PATCH 08/33] lmb: Add lmb_to_bootmem()
in [Kernel]
|
Prev: [PATCH 03/33] lmb: Seperate region array from lmb_region struct
Next: [PATCH 04/33] lmb: Seperate __lmb_find_base() from __lmb_alloc_base()
From: Yinghai Lu on 30 Mar 2010 22: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> --- include/linux/lmb.h | 2 ++ mm/lmb.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/include/linux/lmb.h b/include/linux/lmb.h index 598662f..1e236d1 100644 --- a/include/linux/lmb.h +++ b/include/linux/lmb.h @@ -91,6 +91,8 @@ u64 __lmb_find_area(u64 ei_start, u64 ei_last, u64 start, u64 end, u64 size, u64 align); u64 lmb_find_area(u64 start, u64 end, u64 size, u64 align); +void lmb_to_bootmem(u64 start, u64 end); + #include <asm/lmb.h> #endif /* __KERNEL__ */ diff --git a/mm/lmb.c b/mm/lmb.c index 3fce816..f25f98c 100644 --- a/mm/lmb.c +++ b/mm/lmb.c @@ -630,6 +630,38 @@ void __init lmb_free_area(u64 start, u64 end) __check_and_double_region_array(&lmb.reserved, &lmb_reserved_region[0]); } +#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.region != lmb_reserved_region) + lmb_free(__pa(lmb.reserved.region), sizeof(struct lmb_property) * lmb.reserved.nr_regions); + + count = lmb.reserved.cnt; + pr_info("(%d early reservations) ==> bootmem [%010llx - %010llx]\n", count, start, end); + for (i = 0; i < count; i++) { + struct lmb_property *r = &lmb.reserved.region[i]; + pr_info(" #%d [%010llx - %010llx] ", i, r->base, 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.region[0], 0, sizeof(struct lmb_property) * lmb.reserved.nr_regions); + lmb.reserved.region = NULL; + lmb.reserved.nr_regions = 0; + lmb.reserved.cnt = 0; +} +#endif + 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/ |