Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp661851ybt; Wed, 8 Jul 2020 08:42:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyqBkf2tDYcMCQ9b5GzQETwzNR8+VvQDjsbwi1e83z3AYboQzIxp7VAeQYhM/waJOAOXM10 X-Received: by 2002:a17:906:7b54:: with SMTP id n20mr51450643ejo.144.1594222949294; Wed, 08 Jul 2020 08:42:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594222949; cv=none; d=google.com; s=arc-20160816; b=PFoQdXxRfIDSgw9R5JzmqXPbXa9Myi3cAaLE5F5L2pjhdyYuxcnBAyolOohWRsq4do vQM6bQR2UtB1SuR8ABhE8na9BuHcHlC/rBk/iLe/rsSaa1vdcZpj6TZPnvDCve4pMRBd MhWCCxbuQzemrvPV4Bc5K2e4d5v6btjibVLgukxqmaaT5ioDmNJw/IeboRz4phUqFVJ3 p9JaDTbGlBt7hSea2urKnbmYgfpzDmRj3cgMl215904r/QsD/+OusV387Vn8xjzzw49h yEWXUwRCSNfR7ZFwHCTDZeB45pTc3KHpLYSJ95+MtHTIyj0ZRDRDORZEe1JlK7kY2vtR X0vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=X20MLH8XxiHbC4Eavd69CwIBHQOuOb4aKNFQ+jC9RA8=; b=uFQrdDhf9sUGOkqOJLFISBYs3HeNU1eYep8QSIqm28+pt6UWp19howQRCchOTiMkWi t4SIDilW+a1gAr8yKufWPhczwM++KWGtRtcltIIXWaLyHynZXaih3kBtH/uImb5ptLHw ic4S47NRMCIGbuRHuXPLJGMXKj/EEwEszxFPUNHM2r39Vx5ZsBm0RoQDPewOMSmilpwT XQd7EQJzE06m/oVEKfn82whODTtXCoonNWj4P5u0yUAFuJCdUQmPOQBt0U29tk/fMyUQ Wjx2n1NJygnR/yCJC/C/rufpimPgJDm50XDCZUnTmSzCaHYv3rnLoodltvygay+vr7NU BNMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zBqqyTA8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id jp14si132144ejb.93.2020.07.08.08.42.05; Wed, 08 Jul 2020 08:42:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zBqqyTA8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730462AbgGHPlh (ORCPT + 99 others); Wed, 8 Jul 2020 11:41:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:48230 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730466AbgGHPle (ORCPT ); Wed, 8 Jul 2020 11:41:34 -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 EB51520720; Wed, 8 Jul 2020 15:41:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594222893; bh=4HQ1Wp6eEHqKDLEe+sWSp1dpWtQpdaoDraJF8faeaCg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zBqqyTA8i+gxbFOdeTpUDdMgkWVrVaulbydfvuSxT+pPfvcaz4i/hNB4M4JmxEjpu zVypcnBq0H5FSnpzUsQTF1HKwEZQurzNGs3EzLL3cQXXntXtrtPH9aEBSXEXaZ/t6/ tv1o01AzTvAvotIgwOsCiIJoskJQeEuMmNYL9M94= 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.7 13/30] m68k: mm: fix node memblock init Date: Wed, 8 Jul 2020 11:40:59 -0400 Message-Id: <20200708154116.3199728-13-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200708154116.3199728-1-sashal@kernel.org> References: <20200708154116.3199728-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 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