From: Yinghai Lu on 30 Mar 2010 22:30 So We can construct one generic __find_lmb_area() later Signed-off-by: Yinghai Lu <yinghai(a)kernel.org> --- mm/lmb.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/mm/lmb.c b/mm/lmb.c index 65b62dc..392d805 100644 --- a/mm/lmb.c +++ b/mm/lmb.c @@ -393,7 +393,7 @@ u64 __init lmb_alloc_base(u64 size, u64 align, u64 max_addr) return alloc; } -u64 __init __lmb_alloc_base(u64 size, u64 align, u64 max_addr) +static u64 __init __lmb_find_base(u64 size, u64 align, u64 max_addr) { long i, j; u64 base = 0; @@ -426,8 +426,6 @@ u64 __init __lmb_alloc_base(u64 size, u64 align, u64 max_addr) j = lmb_overlaps_region(&lmb.reserved, base, size); if (j < 0) { /* this area isn't reserved, take it */ - if (lmb_add_region(&lmb.reserved, base, size) < 0) - return 0; return base; } res_base = lmb.reserved.region[j].base; @@ -436,7 +434,22 @@ u64 __init __lmb_alloc_base(u64 size, u64 align, u64 max_addr) base = lmb_align_down(res_base - size, align); } } - return 0; + return -1ULL; +} + +u64 __init __lmb_alloc_base(u64 size, u64 align, u64 max_addr) +{ + u64 base; + + base = __lmb_find_base(size, align, max_addr); + + if (base == -1ULL) + return 0; + + if (lmb_add_region(&lmb.reserved, base, size) < 0) + return 0; + + return base; } /* You must call lmb_analyze() before this. */ -- 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 08/33] lmb: Add lmb_to_bootmem() Next: [PATCH -v11 00/33] use lmb with x86 |