From patchwork Tue Feb 18 23:47:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Pitre X-Patchwork-Id: 3677181 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9AB659F35F for ; Tue, 18 Feb 2014 23:48:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ADEF220176 for ; Tue, 18 Feb 2014 23:48:39 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A51FB20163 for ; Tue, 18 Feb 2014 23:48:38 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WFuOj-0001Od-Mf; Tue, 18 Feb 2014 23:48:21 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WFuOh-00053e-6g; Tue, 18 Feb 2014 23:48:19 +0000 Received: from mail-qa0-f41.google.com ([209.85.216.41]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WFuOe-00051e-II for linux-arm-kernel@lists.infradead.org; Tue, 18 Feb 2014 23:48:17 +0000 Received: by mail-qa0-f41.google.com with SMTP id w8so24864247qac.0 for ; Tue, 18 Feb 2014 15:47:53 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:in-reply-to:message-id :references:user-agent:mime-version:content-type; bh=uAjlZdEendzPKPMlX0rO5CRMeXvZ9t5Xs49VGt2jLyI=; b=U/InTT9swdF3A9DlhWtPuz0a4FzM5KElb2cqUqcYKk6ysvjx4HMCa0s4IYPsWPpskY aRCBCwm5lbshQrDX3gbZ7iO+vlgqSHuP62MblqtOLIBb/vGnmoebuq0nzekA235CtJ0c rKA8ZXqnETtrVuK0FkjfHZDLqot5j+oTUDWY+eXYQ67uO3AjUE2sbpoDXQNKWf07tDwB e0RRqrYwvewEVJ5OZzb7au23PBxH8i0V+wjSjTODqUf5c53mIs+NhelMqYMdDAtfXcNh DkMfz60ehuzqXvRv2jx7qT150GcYK6AKWNopkmQHpTLTFTnAz+KJ1L7F01YblGMcI43G QsHA== X-Gm-Message-State: ALoCoQnpA2E9nx0I/HDIYuqsRMZ33hvZj1olnUltPl6CQd8DJRW4bTF/H5EXpjlTWnGh08t1vP0B X-Received: by 10.140.51.109 with SMTP id t100mr44009684qga.50.1392767272688; Tue, 18 Feb 2014 15:47:52 -0800 (PST) Received: from xanadu.home (modemcable177.143-130-66.mc.videotron.ca. [66.130.143.177]) by mx.google.com with ESMTPSA id d7sm60033376qad.10.2014.02.18.15.47.50 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 18 Feb 2014 15:47:52 -0800 (PST) Date: Tue, 18 Feb 2014 18:47:50 -0500 (EST) From: Nicolas Pitre To: Laura Abbott Subject: Re: [PATCHv4 2/2] arm: Get rid of meminfo In-Reply-To: <1392761733-32628-3-git-send-email-lauraa@codeaurora.org> Message-ID: References: <1392761733-32628-1-git-send-email-lauraa@codeaurora.org> <1392761733-32628-3-git-send-email-lauraa@codeaurora.org> User-Agent: Alpine 2.11 (LFD 23 2013-08-11) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140218_184816_633734_FEF3255C X-CRM114-Status: GOOD ( 17.71 ) X-Spam-Score: 0.3 (/) Cc: Andrew Lunn , Catalin Marinas , Will Deacon , Grant Likely , linux-mm@kvack.org, Daniel Walker , Marek Szyprowski , Kukjin Kim , Russell King , David Brown , Sebastian Hesselbarth , Grygorii Strashko , Jason Cooper , linux-arm-msm@vger.kernel.org, Haojian Zhuang , Leif Lindholm , Ben Dooks , linux-arm-kernel@lists.infradead.org, Courtney Cavin , Eric Miao , Ard Biesheuvel , linux-kernel@vger.kernel.org, Santosh Shilimkar , Andrew Morton X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,KHOP_BIG_TO_CC, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Tue, 18 Feb 2014, Laura Abbott wrote: > memblock is now fully integrated into the kernel and is the prefered > method for tracking memory. Rather than reinvent the wheel with > meminfo, migrate to using memblock directly instead of meminfo as > an intermediate. > > Acked-by: Jason Cooper > Acked-by: Catalin Marinas > Acked-by: Santosh Shilimkar > Acked-by: Kukjin Kim > Tested-by: Marek Szyprowski > Tested-by: Leif Lindholm > Signed-off-by: Laura Abbott Reviewed-by: Nicolas Pitre A small comments below. > diff --git a/arch/arm/include/asm/setup.h b/arch/arm/include/asm/setup.h > index 8d6a089..0196091 100644 > --- a/arch/arm/include/asm/setup.h > +++ b/arch/arm/include/asm/setup.h > @@ -26,29 +26,6 @@ static const struct tagtable __tagtable_##fn __tag = { tag, fn } > */ > #define NR_BANKS CONFIG_ARM_NR_BANKS This may go as well now. Please consider this patch as well for your series: Subject: [PATCH] arm: Get rid of NR_BANKS This constant is no longer used, except in the atag_to_fdt compatibility layer where a local definition is now provided. This could be removed entirely i.e. having no limits but this is probably not worth it. Signed-off-by: Nicolas Pitre diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index e254198177..1ca42ed304 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1090,11 +1090,6 @@ source "arch/arm/firmware/Kconfig" source arch/arm/mm/Kconfig -config ARM_NR_BANKS - int - default 16 if ARCH_EP93XX - default 8 - config IWMMXT bool "Enable iWMMXt support" if !CPU_PJ4 depends on CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_PJ4 diff --git a/arch/arm/boot/compressed/atags_to_fdt.c b/arch/arm/boot/compressed/atags_to_fdt.c index d1153c8a76..9448aa0c66 100644 --- a/arch/arm/boot/compressed/atags_to_fdt.c +++ b/arch/arm/boot/compressed/atags_to_fdt.c @@ -7,6 +7,8 @@ #define do_extend_cmdline 0 #endif +#define NR_BANKS 16 + static int node_offset(void *fdt, const char *node_path) { int offset = fdt_path_offset(fdt, node_path); diff --git a/arch/arm/include/asm/setup.h b/arch/arm/include/asm/setup.h index 01960916dd..e0adb9f1bf 100644 --- a/arch/arm/include/asm/setup.h +++ b/arch/arm/include/asm/setup.h @@ -21,11 +21,6 @@ #define __tagtable(tag, fn) \ static const struct tagtable __tagtable_##fn __tag = { tag, fn } -/* - * Memory map description - */ -#define NR_BANKS CONFIG_ARM_NR_BANKS - extern int arm_add_memory(u64 start, u64 size); extern void early_print(const char *str, ...); extern void dump_machine_table(void);