From 745a190d6355e8f3ba7457d570657abcbe578440 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: 32994 b: refs/heads/master c:
 30f30e13055d1e018c70d2b1b3ff86f8c25c511b 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 6f8786d42656..4f8cb6490a5b 100644
--- 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
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++) {