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: 3677131 Return-Path: X-Original-To: patchwork-linux-arm-msm@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 036F39F35F for ; Tue, 18 Feb 2014 23:47:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0743120176 for ; Tue, 18 Feb 2014 23:47:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F0D0620163 for ; Tue, 18 Feb 2014 23:47:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751932AbaBRXrz (ORCPT ); Tue, 18 Feb 2014 18:47:55 -0500 Received: from mail-qc0-f179.google.com ([209.85.216.179]:39462 "EHLO mail-qc0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750871AbaBRXrx (ORCPT ); Tue, 18 Feb 2014 18:47:53 -0500 Received: by mail-qc0-f179.google.com with SMTP id e16so26372162qcx.38 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=BLSt+M+7fX9DhmXRDbmJBZgey7OlIJxr3Ur4uDTuYDnn4IS+vICp2TY/gs/npcSHa+ UadhaqMp7FB68sdzifXQcrBJZqeTCspdvHFcoqz/AwvE9HZad/Jz+CKH1aqC603fdYdo Lk0NJLuWybrXxehz8A2TRcS7ZnDYQrpBbg9CA4uH2+M6AC0A12RKxOXdXS5Uw+AiIblg IoLEuFHZwuz51stGpc5XHtIkDTl/Di0SjBORhw9a1JdAVrvb0Qi52UIYBR6gP5p1t98R E6LXPDcwKJ4DhDj/5bLoXkp2xAV0M8fIBv+AnXpvZsag/Qhn0dDQ9w9T47iG07wT7D1v hgoA== X-Gm-Message-State: ALoCoQkUFusIaPnFjoACiz0hRHiJSRyj18RcgFNJijwuiFBs2X/ZJETM+MmfIeZoc9Ln17AoF7wg 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-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00,KHOP_BIG_TO_CC, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 --- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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);