---

yaml --- r: 222191 b: refs/heads/master c: 4a89261 h: refs/heads/master i: 222189: 80e7d5a 222187: e615ad3 222183: 20a5230 222175: 0cf310e v: v3
git-mirror · Nov 18, 2010 · 126e8aa · 126e8aa
1 parent 9e3521c
commit 126e8aa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01cf6fe8553b0ac649f3323d8da69b51cad8c468
+refs/heads/master: 4a89261b02d421cc1bcadaaebb90bb7919db0854
diff --git a/trunk/arch/powerpc/mm/tlb_nohash.c b/trunk/arch/powerpc/mm/tlb_nohash.c
@@ -585,6 +585,6 @@ void setup_initial_memory_limit(phys_addr_t first_memblock_base,
 	ppc64_rma_size = min_t(u64, first_memblock_size, 0x40000000);
 
 	/* Finally limit subsequent allocations */
-	memblock_set_current_limit(ppc64_memblock_base + ppc64_rma_size);
+	memblock_set_current_limit(first_memblock_base + ppc64_rma_size);
 }
 #endif /* CONFIG_PPC64 */