Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 106107
b: refs/heads/master
c: 22e1a4d
h: refs/heads/master
i:
  106105: 4f73f15
  106103: 8ecbb23
v: v3
  • Loading branch information
Nathan Fontenot authored and Benjamin Herrenschmidt committed Jul 25, 2008
1 parent 283be7c commit d5a74b7
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a90ab95a9576d35de0d05f9f4fc435edcccafaa9
refs/heads/master: 22e1a4dd3f2a9009d1d8896a5e833b6094877008
10 changes: 10 additions & 0 deletions trunk/arch/powerpc/kernel/lparcfg.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit d5a74b7

Please sign in to comment.