lkml.org 
[lkml]   [2019]   [Dec]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 200/321] mm/page_alloc.c: deduplicate __memblock_free_early() and memblock_free()
    Date
    From: Wentao Wang <witallwang@gmail.com>

    [ Upstream commit d31cfe7bff9109476da92c245b56083e9b48d60a ]

    Link: http://lkml.kernel.org/r/C8ECE1B7A767434691FEEFA3A01765D72AFB8E78@MX203CL03.corp.emc.com
    Signed-off-by: Wentao Wang <witallwang@gmail.com>
    Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
    Cc: Mike Rapoport <rppt@linux.ibm.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    mm/memblock.c | 7 +------
    1 file changed, 1 insertion(+), 6 deletions(-)

    diff --git a/mm/memblock.c b/mm/memblock.c
    index 237944479d25a..bb4e32c6b19e9 100644
    --- a/mm/memblock.c
    +++ b/mm/memblock.c
    @@ -1537,12 +1537,7 @@ void * __init memblock_virt_alloc_try_nid(
    */
    void __init __memblock_free_early(phys_addr_t base, phys_addr_t size)
    {
    - phys_addr_t end = base + size - 1;
    -
    - memblock_dbg("%s: [%pa-%pa] %pF\n",
    - __func__, &base, &end, (void *)_RET_IP_);
    - kmemleak_free_part_phys(base, size);
    - memblock_remove_range(&memblock.reserved, base, size);
    + memblock_free(base, size);
    }

    /**
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-12-03 23:54    [W:4.051 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site