aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-10-27 19:49:33 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-10-28 13:54:44 +0100
commitf25b4b4c89ff118df72421dd2cb080a6380896ac (patch)
treefe836e4aaa8018b776743914a2b2703538ff8370
parentdf4f14c7b22e43e67c0e4e3b005ff897a0a72f4d (diff)
downloadkernel_samsung_aries-f25b4b4c89ff118df72421dd2cb080a6380896ac.zip
kernel_samsung_aries-f25b4b4c89ff118df72421dd2cb080a6380896ac.tar.gz
kernel_samsung_aries-f25b4b4c89ff118df72421dd2cb080a6380896ac.tar.bz2
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>
-rw-r--r--arch/arm/mm/init.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 5422821..5164069 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -122,9 +122,10 @@ void show_mem(void)
printk("%d pages swap cached\n", cached);
}
-static void __init find_limits(struct meminfo *mi,
- unsigned long *min, unsigned long *max_low, unsigned long *max_high)
+static void __init find_limits(unsigned long *min, unsigned long *max_low,
+ unsigned long *max_high)
{
+ struct meminfo *mi = &meminfo;
int i;
*min = -1UL;
@@ -317,12 +318,11 @@ void __init arm_memblock_init(struct meminfo *mi, struct machine_desc *mdesc)
void __init bootmem_init(void)
{
- struct meminfo *mi = &meminfo;
unsigned long min, max_low, max_high;
max_low = max_high = 0;
- find_limits(mi, &min, &max_low, &max_high);
+ find_limits(&min, &max_low, &max_high);
arm_bootmem_init(min, max_low);