From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeremy Kerr Subject: [PATCH 03/11] arm: export arm_add_memory Date: Tue, 22 Dec 2009 18:54:56 +0800 Message-ID: <1261479296.246435.297518795208.3.gpush@pororo> References: <1261479296.245235.191110925832.0.gpush@pororo> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1261479296.245235.191110925832.0.gpush@pororo> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org Errors-To: devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org To: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org Cc: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org List-Id: devicetree@vger.kernel.org We'd like to add memory from the device tree, so make arm_add_memory non-static and add a prototype in setup.h Signed-off-by: Jeremy Kerr --- arch/arm/include/asm/setup.h | 2 ++ arch/arm/kernel/setup.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/include/asm/setup.h b/arch/arm/include/asm/setup.h index 3b6f461..3fa2555 100644 --- a/arch/arm/include/asm/setup.h +++ b/arch/arm/include/asm/setup.h @@ -225,6 +225,8 @@ extern struct meminfo meminfo; extern char cmd_line[COMMAND_LINE_SIZE]; +extern int arm_add_memory(unsigned long start, unsigned long size); + #endif /* __KERNEL__ */ #endif diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 4206286..84fd876 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -383,7 +383,7 @@ static struct machine_desc * __init setup_machine(unsigned int nr) return list; } -static int __init arm_add_memory(unsigned long start, unsigned long size) +int __init arm_add_memory(unsigned long start, unsigned long size) { struct membank *bank = &meminfo.bank[meminfo.nr_banks];