---

yaml --- r: 34024 b: refs/heads/master c: e7c1f69 h: refs/heads/master v: v3
git-mirror · Jul 7, 2006 · 90d270c · 90d270c
1 parent 83bc519
commit 90d270c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73ea6959b11821ba5ade77fb1d3d4aed52be3b67
+refs/heads/master: e7c1f69d4fa4da47dc995b5de64b6cb76ae32081
diff --git a/trunk/arch/powerpc/mm/lmb.c b/trunk/arch/powerpc/mm/lmb.c
@@ -320,7 +320,8 @@ void __init lmb_enforce_memory_limit(unsigned long memory_limit)
 		break;
 	}
 
-	lmb.rmo_size = lmb.memory.region[0].size;
+	if (lmb.memory.region[0].size < lmb.rmo_size)
+		lmb.rmo_size = lmb.memory.region[0].size;
 
 	/* And truncate any reserves above the limit also. */
 	for (i = 0; i < lmb.reserved.cnt; i++) {