diff options
-rw-r--r-- | arch/arm/include/asm/setup.h | 2 | ||||
-rw-r--r-- | arch/arm/kernel/setup.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/include/asm/setup.h b/arch/arm/include/asm/setup.h index f1e5a9bca249..50921182b7c3 100644 --- a/arch/arm/include/asm/setup.h +++ b/arch/arm/include/asm/setup.h | |||
@@ -199,7 +199,7 @@ static struct tagtable __tagtable_##fn __tag = { tag, fn } | |||
199 | #endif | 199 | #endif |
200 | 200 | ||
201 | struct membank { | 201 | struct membank { |
202 | unsigned long start; | 202 | phys_addr_t start; |
203 | unsigned long size; | 203 | unsigned long size; |
204 | unsigned int highmem; | 204 | unsigned int highmem; |
205 | }; | 205 | }; |
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 77af580953e6..9d4a84402ae9 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c | |||
@@ -442,7 +442,7 @@ static struct machine_desc * __init setup_machine(unsigned int nr) | |||
442 | return list; | 442 | return list; |
443 | } | 443 | } |
444 | 444 | ||
445 | static int __init arm_add_memory(unsigned long start, unsigned long size) | 445 | static int __init arm_add_memory(phys_addr_t start, unsigned long size) |
446 | { | 446 | { |
447 | struct membank *bank = &meminfo.bank[meminfo.nr_banks]; | 447 | struct membank *bank = &meminfo.bank[meminfo.nr_banks]; |
448 | 448 | ||
@@ -478,7 +478,8 @@ static int __init arm_add_memory(unsigned long start, unsigned long size) | |||
478 | static int __init early_mem(char *p) | 478 | static int __init early_mem(char *p) |
479 | { | 479 | { |
480 | static int usermem __initdata = 0; | 480 | static int usermem __initdata = 0; |
481 | unsigned long size, start; | 481 | unsigned long size; |
482 | phys_addr_t start; | ||
482 | char *endp; | 483 | char *endp; |
483 | 484 | ||
484 | /* | 485 | /* |