From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 68EB8C433DF for ; Wed, 8 Jul 2020 15:43:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3AF3A20720 for ; Wed, 8 Jul 2020 15:43:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594223007; bh=XTUF+o5CIluzJxCVc/liIpiAQyJPlLkC0DzwQTYaWYY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=jIWrtUJ8ZQDIupn0LTCgOCHuOPi1NVrZoqFMPRJx2ZNhiWKvIKUbHkOHW+vmCWdcw dUHtRIf4UdpIoY4qxZLSMKm7aWBLE4nsuE97cl1fKUqPXnpwHSzxF2GwpDw9rsf/XH z/yFZdml53432Coda5ymG23mKVC1VquMbfVMSY/Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730269AbgGHPn0 (ORCPT ); Wed, 8 Jul 2020 11:43:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:48836 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730559AbgGHPls (ORCPT ); Wed, 8 Jul 2020 11:41:48 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B8C9D207D0; Wed, 8 Jul 2020 15:41:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594222908; bh=XTUF+o5CIluzJxCVc/liIpiAQyJPlLkC0DzwQTYaWYY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DbcTNnuK4E83N4uXKG+Gb4AI7TSBAzw+G6aweOFrHPghOA5u3aLve8pJcY/j8YHDP XWOFfY+FfbHyRTIicb6K/Z3VsmHDNTJ09zhEEcO7LgxfayUinvbQXCfqWgScti4cCm iXLH41rAp3IaeaFV1QGQrbAYL0JFx1lvJtJlaYfE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Angelo Dureghello , Mike Rapoport , Greg Ungerer , Sasha Levin , linux-m68k@lists.linux-m68k.org Subject: [PATCH AUTOSEL 5.4 10/16] m68k: mm: fix node memblock init Date: Wed, 8 Jul 2020 11:41:29 -0400 Message-Id: <20200708154135.3199907-10-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200708154135.3199907-1-sashal@kernel.org> References: <20200708154135.3199907-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-m68k-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-m68k@vger.kernel.org From: Angelo Dureghello [ 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 Signed-off-by: Mike Rapoport Signed-off-by: Greg Ungerer Signed-off-by: Sasha Levin --- 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 6cb1e41d58d00..70a5f55ea6647 100644 --- a/arch/m68k/mm/mcfmmu.c +++ b/arch/m68k/mm/mcfmmu.c @@ -164,7 +164,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