From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754820Ab0JYJBd (ORCPT ); Mon, 25 Oct 2010 05:01:33 -0400 Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]:46562 "EHLO cam-admin0.cambridge.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754410Ab0JYJBa (ORCPT ); Mon, 25 Oct 2010 05:01:30 -0400 Subject: [RFC PATCH 15/18] ARM: LPAE: use phys_addr_t for physical start address in early_mem To: linux-arm-kernel@lists.infradead.org From: Catalin Marinas Cc: Will Deacon , linux-kernel@vger.kernel.org Date: Mon, 25 Oct 2010 10:00:58 +0100 Message-ID: <20101025090058.25275.69824.stgit@e102109-lin.cambridge.arm.com> In-Reply-To: <20101025085812.25275.55757.stgit@e102109-lin.cambridge.arm.com> References: <20101025085812.25275.55757.stgit@e102109-lin.cambridge.arm.com> User-Agent: StGit/0.15-103-g0e84 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 25 Oct 2010 09:00:59.0142 (UTC) FILETIME=[2445C260:01CB7423] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Will Deacon The physical start address of memory may be > 4GB and therefore unrepresentable using an unsigned long. This patch changes early_mem and arm_add_memory to use phys_addr_t instead of unsigned long for the start address. Signed-off-by: Will Deacon Signed-off-by: Catalin Marinas --- arch/arm/kernel/setup.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index bfa710d..b1f3fe9 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -407,7 +407,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) +static int __init arm_add_memory(phys_addr_t start, unsigned long size) { struct membank *bank = &meminfo.bank[meminfo.nr_banks]; @@ -443,7 +443,8 @@ static int __init arm_add_memory(unsigned long start, unsigned long size) static int __init early_mem(char *p) { static int usermem __initdata = 0; - unsigned long size, start; + unsigned long size; + phys_addr_t start; char *endp; /*