lkml.org 
[lkml]   [2013]   [Dec]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 10/23] mm/printk: Use memblock apis for early memory allocations
    Date
    Switch to memblock interfaces for early memory allocator instead of
    bootmem allocator. No functional change in beahvior than what it is
    in current code from bootmem users points of view.

    Archs already converted to NO_BOOTMEM now directly use memblock
    interfaces instead of bootmem wrappers build on top of memblock. And the
    archs which still uses bootmem, these new apis just fallback to exiting
    bootmem APIs.

    Cc: Yinghai Lu <yinghai@kernel.org>
    Cc: Tejun Heo <tj@kernel.org>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
    Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
    ---
    kernel/printk/printk.c | 10 +++-------
    1 file changed, 3 insertions(+), 7 deletions(-)

    diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
    index be7c86b..f8b41bd 100644
    --- a/kernel/printk/printk.c
    +++ b/kernel/printk/printk.c
    @@ -757,14 +757,10 @@ void __init setup_log_buf(int early)
    return;

    if (early) {
    - unsigned long mem;
    -
    - mem = memblock_alloc(new_log_buf_len, PAGE_SIZE);
    - if (!mem)
    - return;
    - new_log_buf = __va(mem);
    + new_log_buf =
    + memblock_virt_alloc(new_log_buf_len, PAGE_SIZE);
    } else {
    - new_log_buf = alloc_bootmem_nopanic(new_log_buf_len);
    + new_log_buf = memblock_virt_alloc_nopanic(new_log_buf_len, 0);
    }

    if (unlikely(!new_log_buf)) {
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2013-12-10 03:21    [W:2.234 / U:0.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site