From d5a74b7bedff8389f2b323f00b035c67529cc4d0 Mon Sep 17 00:00:00 2001
From: Nathan Fontenot <nfont@austin.ibm.com>
Date: Thu, 24 Jul 2008 04:31:52 +1000
Subject: [PATCH] --- yaml --- r: 106107 b: refs/heads/master c:
 22e1a4dd3f2a9009d1d8896a5e833b6094877008 h: refs/heads/master i:   106105:
 4f73f158ddf2c2153893706e556f576921dff6d5   106103:
 8ecbb234ded73e5118bfc3b50702dcf4408fb8e4 v: v3

---
 [refs]                              |  2 +-
 trunk/arch/powerpc/kernel/lparcfg.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0a1cd7500a4a..4b196f98388e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a90ab95a9576d35de0d05f9f4fc435edcccafaa9
+refs/heads/master: 22e1a4dd3f2a9009d1d8896a5e833b6094877008
diff --git a/trunk/arch/powerpc/kernel/lparcfg.c b/trunk/arch/powerpc/kernel/lparcfg.c
index 848c3e5a6370..64381a204a58 100644
--- a/trunk/arch/powerpc/kernel/lparcfg.c
+++ b/trunk/arch/powerpc/kernel/lparcfg.c
@@ -34,6 +34,7 @@
 #include <asm/time.h>
 #include <asm/prom.h>
 #include <asm/vdso_datapage.h>
+#include <asm/vio.h>
 
 #define MODULE_VERS "1.8"
 #define MODULE_NAME "lparcfg"
@@ -527,6 +528,15 @@ static ssize_t update_mpp(u64 *entitlement, u8 *weight)
 	u8 new_weight;
 	ssize_t rc;
 
+	if (entitlement) {
+		/* Check with vio to ensure the new memory entitlement
+		 * can be handled.
+		 */
+		rc = vio_cmo_entitlement_update(*entitlement);
+		if (rc)
+			return rc;
+	}
+
 	rc = h_get_mpp(&mpp_data);
 	if (rc)
 		return rc;