---

yaml --- r: 32994 b: refs/heads/master c: 30f30e1 h: refs/heads/master v: v3
git-mirror · Jul 25, 2006 · 745a190 · 745a190
1 parent 0b559a6
commit 745a190
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: 98c82472e98469ef23d7c680a0d6be1429540166
+refs/heads/master: 30f30e13055d1e018c70d2b1b3ff86f8c25c511b
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++) {