---

yaml --- r: 201437 b: refs/heads/master c: a9deb13 h: refs/heads/master i: 201435: 5ffae53 v: v3
git-mirror · Jul 27, 2010 · e3f5aaa · e3f5aaa
1 parent 94bb294
commit e3f5aaa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e07b9e08601b400aee7e076e7b31799d3dd48c1e
+refs/heads/master: a9deb137e4eb94d0a4fa0c3535b2c056d9363bef
diff --git a/trunk/arch/arm/mm/init.c b/trunk/arch/arm/mm/init.c
@@ -190,14 +190,12 @@ static void __init arm_bootmem_init(struct meminfo *mi,
 	}
 }
 
-static void __init arm_bootmem_free(struct meminfo *mi)
+static void __init arm_bootmem_free(struct meminfo *mi, unsigned long min,
+	unsigned long max_low, unsigned long max_high)
 {
 	unsigned long zone_size[MAX_NR_ZONES], zhole_size[MAX_NR_ZONES];
-	unsigned long min, max_low, max_high;
 	int i;
 
-	find_limits(mi, &min, &max_low, &max_high);
-
 	/*
 	 * initialise the zones.
 	 */
@@ -330,7 +328,7 @@ void __init bootmem_init(void)
 	 * the sparse mem_map arrays initialized by sparse_init()
 	 * for memmap_init_zone(), otherwise all PFNs are invalid.
 	 */
-	arm_bootmem_free(mi);
+	arm_bootmem_free(mi, min, max_low, max_high);
 
 	high_memory = __va((max_low << PAGE_SHIFT) - 1) + 1;