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: 24923 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f71.google.com (mail-pa0-f71.google.com [209.85.220.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5000E202B2 for ; Tue, 18 Feb 2014 23:48:10 +0000 (UTC) Received: by mail-pa0-f71.google.com with SMTP id kp14sf42696764pab.6 for ; Tue, 18 Feb 2014 15:48:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:date:from:to:cc:subject:in-reply-to :message-id:references:user-agent:mime-version:sender:precedence :list-id:x-original-sender:x-original-authentication-results :mailing-list:list-post:list-help:list-archive:list-unsubscribe :content-type; bh=K0QYLFZpTozIZhOX16+DknyjRVn5oSSbb/TXHzSOc9c=; b=GQuIG0z3c2MIgRfPtVFfk/Ebecjmv/JFR4PCTj9MXHaP+02Q9J5hELubXb4lkbWaRi PsimrZ8PzfAp768VPBQsa0wcJY5GzScQK6fKUOssjJ1aWGmGBSMdWVRZ/nkMK+UB6I/w rZ2C/s98+YycYm5Tz1qLQgDSxOH7X4JpS9nf8mgsaGfkHkMbPGoxrsqK+w4XcplE8RAl L4OUg+HooEXFCqC4IwXWKJsUMrkXgdriRp+RJUP7uOemKSjOPnCSC0nMtur25nOjQWiS yb/wiWNTMWKxwBLpbcHOokBnVWpR/VCff1lLyy7OpNmPwSy4oA+vUEZBbXB25HcaC2UB qE/Q== X-Gm-Message-State: ALoCoQmOpHJBqOXptmmi0DF1vHHFsFcBxq8e0n1lAts7owx+gDkks9rMOGSjj7pODYBCta6YZchh X-Received: by 10.67.14.70 with SMTP id fe6mr13873693pad.15.1392767289545; Tue, 18 Feb 2014 15:48:09 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.24.49 with SMTP id 46ls1526541qgq.21.gmail; Tue, 18 Feb 2014 15:48:09 -0800 (PST) X-Received: by 10.52.61.133 with SMTP id p5mr19494226vdr.4.1392767289407; Tue, 18 Feb 2014 15:48:09 -0800 (PST) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id eb8si6033281vdb.60.2014.02.18.15.48.09 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 18 Feb 2014 15:48:09 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.169; Received: by mail-vc0-f169.google.com with SMTP id hq11so14158404vcb.0 for ; Tue, 18 Feb 2014 15:48:09 -0800 (PST) X-Received: by 10.220.92.135 with SMTP id r7mr23285371vcm.11.1392767289277; Tue, 18 Feb 2014 15:48:09 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp255615vcz; Tue, 18 Feb 2014 15:48:08 -0800 (PST) X-Received: by 10.66.144.102 with SMTP id sl6mr35615570pab.96.1392767288264; Tue, 18 Feb 2014 15:48:08 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d4si19807736pao.302.2014.02.18.15.48.07; Tue, 18 Feb 2014 15:48:07 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752314AbaBRXr4 (ORCPT + 27 others); Tue, 18 Feb 2014 18:47:56 -0500 Received: from mail-qc0-f172.google.com ([209.85.216.172]:54439 "EHLO mail-qc0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751587AbaBRXrx (ORCPT ); Tue, 18 Feb 2014 18:47:53 -0500 Received: by mail-qc0-f172.google.com with SMTP id c9so26529966qcz.17 for ; Tue, 18 Feb 2014 15:47:53 -0800 (PST) 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 cc: Russell King , David Brown , Daniel Walker , Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Eric Miao , Haojian Zhuang , Ben Dooks , Kukjin Kim , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Leif Lindholm , Grygorii Strashko , Catalin Marinas , Rob Herring , Ard Biesheuvel , Will Deacon , Santosh Shilimkar , linux-mm@kvack.org, Andrew Morton , Courtney Cavin , Marek Szyprowski , Grant Likely 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 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: nicolas.pitre@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 --- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ 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);