summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/setup.h
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2013-10-22 17:53:16 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-10-29 11:06:28 +0000
commit6a5014aa037495a14ea083b621ed97fd0c3c7e9e (patch)
tree4da123acd2de19c44db24d4e12004a27805e3638 /arch/arm/include/asm/setup.h
parent1436c1aa626d0bc0e35c5c5231127086e80ab24a (diff)
downloadblackbird-obmc-linux-6a5014aa037495a14ea083b621ed97fd0c3c7e9e.tar.gz
blackbird-obmc-linux-6a5014aa037495a14ea083b621ed97fd0c3c7e9e.zip
ARM: 7863/1: Let arm_add_memory() always use 64-bit arguments
The DTB and/or the kernel command line may pass 64-bit addresses regardless of kernel configuration, so update arm_add_memory() to take 64-bit arguments independently of the phys_addr_t size. This allows non-wrapping handling of high memory banks such as the second memory bank of APE6EVM (at 0x2_0000_0000) in case of 32-bit phys_addr_t. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/include/asm/setup.h')
-rw-r--r--arch/arm/include/asm/setup.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/setup.h b/arch/arm/include/asm/setup.h
index c50f05609501..8d6a089dfb76 100644
--- a/arch/arm/include/asm/setup.h
+++ b/arch/arm/include/asm/setup.h
@@ -49,7 +49,7 @@ extern struct meminfo meminfo;
#define bank_phys_end(bank) ((bank)->start + (bank)->size)
#define bank_phys_size(bank) (bank)->size
-extern int arm_add_memory(phys_addr_t start, phys_addr_t size);
+extern int arm_add_memory(u64 start, u64 size);
extern void early_print(const char *str, ...);
extern void dump_machine_table(void);
OpenPOWER on IntegriCloud