diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-27 14:49:33 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 08:54:44 -0400 |
commit | f25b4b4c89ff118df72421dd2cb080a6380896ac (patch) | |
tree | fe836e4aaa8018b776743914a2b2703538ff8370 /arch/arm | |
parent | df4f14c7b22e43e67c0e4e3b005ff897a0a72f4d (diff) |
ARM: memblock: move meminfo into find_limits directly
bootmem_init() no longer makes several uses of the membank
information, so move this into the one remaining called function
which does use it.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mm/init.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 5422821d372f..5164069ced42 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c | |||
@@ -122,9 +122,10 @@ void show_mem(void) | |||
122 | printk("%d pages swap cached\n", cached); | 122 | printk("%d pages swap cached\n", cached); |
123 | } | 123 | } |
124 | 124 | ||
125 | static void __init find_limits(struct meminfo *mi, | 125 | static void __init find_limits(unsigned long *min, unsigned long *max_low, |
126 | unsigned long *min, unsigned long *max_low, unsigned long *max_high) | 126 | unsigned long *max_high) |
127 | { | 127 | { |
128 | struct meminfo *mi = &meminfo; | ||
128 | int i; | 129 | int i; |
129 | 130 | ||
130 | *min = -1UL; | 131 | *min = -1UL; |
@@ -317,12 +318,11 @@ void __init arm_memblock_init(struct meminfo *mi, struct machine_desc *mdesc) | |||
317 | 318 | ||
318 | void __init bootmem_init(void) | 319 | void __init bootmem_init(void) |
319 | { | 320 | { |
320 | struct meminfo *mi = &meminfo; | ||
321 | unsigned long min, max_low, max_high; | 321 | unsigned long min, max_low, max_high; |
322 | 322 | ||
323 | max_low = max_high = 0; | 323 | max_low = max_high = 0; |
324 | 324 | ||
325 | find_limits(mi, &min, &max_low, &max_high); | 325 | find_limits(&min, &max_low, &max_high); |
326 | 326 | ||
327 | arm_bootmem_init(min, max_low); | 327 | arm_bootmem_init(min, max_low); |
328 | 328 | ||