From: Mike Rapoport <rppt@kernel.org>
To: Greg Ungerer <gerg@linux-m68k.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>,
linux-m68k@lists.linux-m68k.org, linux-kernel@vger.kernel.org,
Mike Rapoport <rppt@kernel.org>,
Angelo Dureghello <angelo.dureghello@timesys.com>,
Mike Rapoport <rppt@linux.ibm.com>
Subject: [PATCH 2/2] m68k: mm: fix node memblock init
Date: Wed, 17 Jun 2020 09:53:41 +0300 [thread overview]
Message-ID: <20200617065341.32160-3-rppt@kernel.org> (raw)
In-Reply-To: <20200617065341.32160-1-rppt@kernel.org>
From: Angelo Dureghello <angelo.dureghello@timesys.com>
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>
---
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 29f47923aa46..7d04210d34f0 100644
--- a/arch/m68k/mm/mcfmmu.c
+++ b/arch/m68k/mm/mcfmmu.c
@@ -174,7 +174,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.26.2
next prev parent reply other threads:[~2020-06-17 6:53 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-17 6:53 [PATCH 0/2] m68k: fixups for recent changes in memory initialization Mike Rapoport
2020-06-17 6:53 ` [PATCH 1/2] m68k: nommu: register start of the memory with memblock Mike Rapoport
2020-06-17 12:33 ` Greg Ungerer
2020-06-29 1:10 ` Greg Ungerer
2020-06-29 4:14 ` Mike Rapoport
2020-06-29 14:03 ` Greg Ungerer
2020-06-17 6:53 ` Mike Rapoport [this message]
2020-06-17 12:34 ` [PATCH 2/2] m68k: mm: fix node memblock init Greg Ungerer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200617065341.32160-3-rppt@kernel.org \
--to=rppt@kernel.org \
--cc=angelo.dureghello@timesys.com \
--cc=geert@linux-m68k.org \
--cc=gerg@linux-m68k.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=rppt@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.