From patchwork Thu Mar 21 09:27:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Bolle X-Patchwork-Id: 229599 X-Patchwork-Delegate: michael@ellerman.id.au Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 088762C0145 for ; Thu, 21 Mar 2013 20:28:35 +1100 (EST) Received: from cpsmtpb-ews04.kpnxchange.com (cpsmtpb-ews04.kpnxchange.com [213.75.39.7]) by ozlabs.org (Postfix) with ESMTP id C91FC2C00BC for ; Thu, 21 Mar 2013 20:28:01 +1100 (EST) Received: from cpsps-ews14.kpnxchange.com ([10.94.84.181]) by cpsmtpb-ews04.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Thu, 21 Mar 2013 10:26:25 +0100 Received: from CPSMTPM-TLF102.kpnxchange.com ([195.121.3.5]) by cpsps-ews14.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Thu, 21 Mar 2013 10:26:26 +0100 Received: from [192.168.1.110] ([212.123.139.93]) by CPSMTPM-TLF102.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Thu, 21 Mar 2013 10:27:56 +0100 Message-ID: <1363858076.1390.104.camel@x61.thuisdomein> Subject: [PATCH] memblock: kill "config MAX_ACTIVE_REGIONS" From: Paul Bolle To: James Hogan , Benjamin Herrenschmidt , Paul Mackerras , Paul Mundt Date: Thu, 21 Mar 2013 10:27:56 +0100 X-Mailer: Evolution 3.4.4 (3.4.4-2.fc17) Mime-Version: 1.0 X-OriginalArrivalTime: 21 Mar 2013 09:27:56.0486 (UTC) FILETIME=[5EF95E60:01CE2616] X-RcptDomain: lists.ozlabs.org Cc: Tejun Heo , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" The Kconfig symbol MAX_ACTIVE_REGIONS is unused. Commit 0ee332c1451869963626bf9cac88f165a90990e1 ("memblock: Kill early_node_map[]") removed the only place were it was actually used. But it did not remove its Kconfig entries (for powerpc and sh). Remove those two entries (and the entry for metag, that popped up in v3.9-rc1). Signed-off-by: Paul Bolle Acked-by: Paul Mundt Acked-by: James Hogan --- 0) Eyeball tested again. 1) It felt silly to split this clean up patch into three patches. But if the maintainers involved disagree I'm happy to split and resend it. arch/metag/mm/Kconfig | 5 ----- arch/powerpc/Kconfig | 5 ----- arch/sh/mm/Kconfig | 7 ------- 3 files changed, 17 deletions(-) diff --git a/arch/metag/mm/Kconfig b/arch/metag/mm/Kconfig index 794f26a..03fb8f1 100644 --- a/arch/metag/mm/Kconfig +++ b/arch/metag/mm/Kconfig @@ -93,11 +93,6 @@ config ARCH_SPARSEMEM_ENABLE config ARCH_SPARSEMEM_DEFAULT def_bool y -config MAX_ACTIVE_REGIONS - int - default "2" if SPARSEMEM - default "1" - config ARCH_SELECT_MEMORY_MODEL def_bool y diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 867ace7..b674397 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -427,11 +427,6 @@ config NODES_SHIFT default "4" depends on NEED_MULTIPLE_NODES -config MAX_ACTIVE_REGIONS - int - default "256" if PPC64 - default "32" - config ARCH_SELECT_MEMORY_MODEL def_bool y depends on PPC64 diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig index 5a43a87..dba285e 100644 --- a/arch/sh/mm/Kconfig +++ b/arch/sh/mm/Kconfig @@ -137,13 +137,6 @@ config ARCH_SPARSEMEM_ENABLE config ARCH_SPARSEMEM_DEFAULT def_bool y -config MAX_ACTIVE_REGIONS - int - default "6" if (CPU_SUBTYPE_SHX3 && SPARSEMEM) - default "2" if SPARSEMEM && (CPU_SUBTYPE_SH7722 || \ - CPU_SUBTYPE_SH7785) - default "1" - config ARCH_SELECT_MEMORY_MODEL def_bool y