summaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorAngelo Dureghello <angelo.dureghello@timesys.com>2020-06-17 09:53:41 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-07-22 09:32:01 +0200
commitc24fb4f560dc5a763f4b513624c5321be2feb12e (patch)
tree1658f15965bba5172b27c2019ef7fab4247480c2 /arch/m68k
parent0ea1f064426525ac59a26c7fe2105eec6e186848 (diff)
downloadlinux-stable-c24fb4f560dc5a763f4b513624c5321be2feb12e.tar.gz
linux-stable-c24fb4f560dc5a763f4b513624c5321be2feb12e.tar.bz2
linux-stable-c24fb4f560dc5a763f4b513624c5321be2feb12e.zip
m68k: mm: fix node memblock init
[ 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>
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/mm/mcfmmu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/mm/mcfmmu.c b/arch/m68k/mm/mcfmmu.c
index f5453d944ff5..c5e26222979a 100644
--- a/arch/m68k/mm/mcfmmu.c
+++ b/arch/m68k/mm/mcfmmu.c
@@ -160,7 +160,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);