lkml.org 
[lkml]   [2010]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 44/49] x86, memblock: Use memblock_debug to control debug message print out
    Date
    Also let memblock_x86_reserve_range/memblock_x86_free_range could print out name if memblock=debug is
    specified

    will also print ther name when reserve_memblock_area/free_memblock_area are called.

    -v2: according to Ingo, put " if (memblock_debug) " in one place

    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    ---
    arch/x86/mm/memblock.c | 20 ++++++++++++--------
    1 files changed, 12 insertions(+), 8 deletions(-)

    diff --git a/arch/x86/mm/memblock.c b/arch/x86/mm/memblock.c
    index 53b0f60..70a6bba 100644
    --- a/arch/x86/mm/memblock.c
    +++ b/arch/x86/mm/memblock.c
    @@ -122,10 +122,10 @@ static void __init memblock_x86_subtract_reserved(struct range *range, int az)

    count = memblock.reserved.cnt;

    - pr_info("Subtract (%d early reservations)\n", count);
    + memblock_dbg("Subtract (%d early reservations)\n", count);

    for_each_memblock(reserved, r) {
    - pr_info(" [%010llx-%010llx]\n", (u64)r->base, (u64)r->base + r->size - 1);
    + memblock_dbg(" [%#010llx-%#010llx]\n", (u64)r->base, (u64)r->base + r->size - 1);
    final_start = PFN_DOWN(r->base);
    final_end = PFN_UP(r->base + r->size);
    if (final_start >= final_end)
    @@ -198,16 +198,16 @@ void __init memblock_x86_to_bootmem(u64 start, u64 end)
    memblock_free(__pa(memblock.reserved.regions), sizeof(struct memblock_region) * memblock.reserved.max);

    count = memblock.reserved.cnt;
    - pr_info("(%d early reservations) ==> bootmem [%010llx-%010llx]\n", count, start, end - 1);
    + memblock_dbg("(%d early reservations) ==> bootmem [%#010llx-%#010llx]\n", count, start, end - 1);
    for_each_memblock(reserved, r) {
    - pr_info(" [%010llx-%010llx] ", (u64)r->base, (u64)r->base + r->size - 1);
    + memblock_dbg(" [%#010llx-%#010llx] ", (u64)r->base, (u64)r->base + r->size - 1);
    final_start = max(start, r->base);
    final_end = min(end, r->base + r->size);
    if (final_start >= final_end) {
    - pr_cont("\n");
    + memblock_dbg("\n");
    continue;
    }
    - pr_cont(" ==> [%010llx-%010llx]\n", final_start, final_end - 1);
    + memblock_dbg(" ==> [%#010llx-%#010llx]\n", final_start, final_end - 1);
    reserve_bootmem_generic(final_start, final_end - final_start, BOOTMEM_DEFAULT);
    }

    @@ -286,9 +286,11 @@ void __init memblock_x86_reserve_range(u64 start, u64 end, char *name)
    if (start == end)
    return;

    - if (WARN_ONCE(start > end, "memblock_x86_reserve_range: wrong range [%#llx, %#llx]\n", start, end))
    + if (WARN_ONCE(start > end, "memblock_x86_reserve_range: wrong range [%#llx, %#llx)\n", start, end))
    return;

    + memblock_dbg(" memblock_x86_reserve_range: [%#010llx-%#010llx] %16s\n", start, end - 1, name);
    +
    memblock_reserve(start, end - start);
    }

    @@ -297,9 +299,11 @@ void __init memblock_x86_free_range(u64 start, u64 end)
    if (start == end)
    return;

    - if (WARN_ONCE(start > end, "memblock_x86_free_range: wrong range [%#llx, %#llx]\n", start, end))
    + if (WARN_ONCE(start > end, "memblock_x86_free_range: wrong range [%#llx, %#llx)\n", start, end))
    return;

    + memblock_dbg(" memblock_x86_free_range: [%#010llx-%#010llx]\n", start, end - 1);
    +
    memblock_free(start, end - start);
    }

    --
    1.6.4.2


    \
     
     \ /
      Last update: 2010-07-20 02:05    [W:0.024 / U:65.020 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site