From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 26 Jul 2011 17:36:15 +0200 (CEST) Received: from mail-ey0-f178.google.com ([209.85.215.178]:53696 "EHLO mail-ey0-f178.google.com" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S1491826Ab1GZPgL (ORCPT ); Tue, 26 Jul 2011 17:36:11 +0200 Received: by mail-ey0-f178.google.com with SMTP id 4so1036536eye.9 for ; Tue, 26 Jul 2011 08:36:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=iJQxxlW1BJ85nI4bJR5UfnbAx9ucA1T/8YaNvf4025E=; b=IFyXsCFxbVXh9kgiBwiRmm0dnSv5fyYpDH06mS2nM1dX1rvMlebVRh5/l1eyvFHX9u FPeR6TOx5eScJ5hCrsOjGv0/NC0XR+CIiyD/ssUnf57p6/MrfiPfY2+hjsnczWjwCBOA oFraJxaoA8J5+gYJD9x5/u0/wMVzsYCUEcdik= Received: by 10.204.133.86 with SMTP id e22mr63694bkt.50.1311694571087; Tue, 26 Jul 2011 08:36:11 -0700 (PDT) Received: from localhost.localdomain ([130.75.117.88]) by mx.google.com with ESMTPS id b3sm68203bke.44.2011.07.26.08.36.09 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 26 Jul 2011 08:36:10 -0700 (PDT) From: Tejun Heo To: benh@kernel.crashing.org, yinghai@kernel.org, hpa@zytor.com, tony.luck@intel.com, ralf@linux-mips.org, schwidefsky@de.ibm.com, liqin.chen@sunplusct.com, lethal@linux-sh.org, davem@davemloft.net, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org Cc: mingo@redhat.com, Tejun Heo , linux-mips@linux-mips.org Subject: [PATCH 19/23] mips: Use HAVE_MEMBLOCK_NODE_MAP Date: Tue, 26 Jul 2011 17:35:30 +0200 Message-Id: <1311694534-5161-20-git-send-email-tj@kernel.org> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1311694534-5161-1-git-send-email-tj@kernel.org> References: <1311694534-5161-1-git-send-email-tj@kernel.org> X-archive-position: 30728 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: tj@kernel.org Precedence: bulk X-list: linux-mips Return-Path: X-Keywords: X-UID: 18717 mips used early_node_map[] just to prime free_area_init_nodes(). Now memblock can be used for the same purpose and early_node_map[] is scheduled to be dropped. Use memblock instead. Signed-off-by: Tejun Heo Cc: Benjamin Herrenschmidt Cc: Yinghai Lu Cc: Ralf Baechle Cc: linux-mips@linux-mips.org --- Only compile tested. Thanks. arch/mips/Kconfig | 3 +++ arch/mips/kernel/setup.c | 3 ++- arch/mips/sgi-ip27/ip27-memory.c | 5 +++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 653da62..368b2ec 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -24,6 +24,9 @@ config MIPS select GENERIC_IRQ_PROBE select GENERIC_IRQ_SHOW select HAVE_ARCH_JUMP_LABEL + select HAVE_MEMBLOCK + select HAVE_MEMBLOCK_NODE_MAP + select ARCH_DISCARD_MEMBLOCK menu "Machine selection" diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 8ad1d56..c25bce4 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -352,7 +353,7 @@ static void __init bootmem_init(void) continue; #endif - add_active_range(0, start, end); + memblock_add_node(PFN_PHYS(start), PFN_PHYS(end - start), 0); } /* diff --git a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c index bc12971..b105eca 100644 --- a/arch/mips/sgi-ip27/ip27-memory.c +++ b/arch/mips/sgi-ip27/ip27-memory.c @@ -12,6 +12,7 @@ */ #include #include +#include #include #include #include @@ -381,8 +382,8 @@ static void __init szmem(void) continue; } num_physpages += slot_psize; - add_active_range(node, slot_getbasepfn(node, slot), - slot_getbasepfn(node, slot) + slot_psize); + memblock_add_node(PFN_PHYS(slot_getbasepfn(node, slot)), + PFN_PHYS(slot_psize), node); } } } -- 1.7.6