lkml.org 
[lkml]   [2020]   [Jul]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 041/244] m68k: mm: fix node memblock init
    Date
    From: Angelo Dureghello <angelo.dureghello@timesys.com>

    [ Upstream commit c43e55796dd4d13f4855971a4d7970ce2cd94db4 ]

    After pulling 5.7.0 (linux-next merge), mcf5441x mmu boot was
    hanging silently.

    memblock_add() seems not appropriate, since using MAX_NUMNODES
    as node id, while memblock_add_node() sets up memory for node id 0.

    Signed-off-by: Angelo Dureghello <angelo.dureghello@timesys.com>
    Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
    Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/m68k/mm/mcfmmu.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/arch/m68k/mm/mcfmmu.c b/arch/m68k/mm/mcfmmu.c
    index 0ea375607767c..2c57f46facc0e 100644
    --- a/arch/m68k/mm/mcfmmu.c
    +++ b/arch/m68k/mm/mcfmmu.c
    @@ -178,7 +178,7 @@ void __init cf_bootmem_alloc(void)
    m68k_memory[0].addr = _rambase;
    m68k_memory[0].size = _ramend - _rambase;

    - memblock_add(m68k_memory[0].addr, m68k_memory[0].size);
    + memblock_add_node(m68k_memory[0].addr, m68k_memory[0].size, 0);

    /* compute total pages in system */
    num_pages = PFN_DOWN(_ramend - _rambase);
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-07-20 18:08    [W:3.176 / U:0.180 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site