From 90d270cae051e2591a9a59200a57d0e5c792120a Mon Sep 17 00:00:00 2001
From: Michael Ellerman <michael@ellerman.id.au>
Date: Tue, 4 Jul 2006 17:13:23 +1000
Subject: [PATCH] --- yaml --- r: 34024 b: refs/heads/master c:
 e7c1f69d4fa4da47dc995b5de64b6cb76ae32081 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/arch/powerpc/mm/lmb.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8628c69b8343..57654697d729 100644
--- 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
index 4b17a7359924..716a2906a24d 100644
--- 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++) {