From 0384f61d3c9b014dae671a9ca100c3db88095ec5 Mon Sep 17 00:00:00 2001
From: Hollis Blanchard <hollisb@us.ibm.com>
Date: Wed, 5 Nov 2008 09:36:20 -0600
Subject: [PATCH] --- yaml --- r: 125215 b: refs/heads/master c:
 b8fd68ac8db1f926fdb2c7f196598a279461de53 h: refs/heads/master i:   125213:
 1a960e97bf6815d0a159d90b504e2b81d1ca4eee   125211:
 8a4940868f515828981fb67fce28027e541c9fde   125207:
 eb7dd10587249117a8e77f0d9fd52a8d9e2c8fdc   125199:
 f781366a1ab9461055dca4ad5c4790e311925863   125183:
 eed11721a1edf1c9c71ceddf96179b16c153de97 v: v3

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

diff --git a/[refs] b/[refs]
index fcc620aa4ec2..66421118f002 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5cf8ca22146fa106f3bb865631ec04f5b499508f
+refs/heads/master: b8fd68ac8db1f926fdb2c7f196598a279461de53
diff --git a/trunk/arch/powerpc/kvm/booke.c b/trunk/arch/powerpc/kvm/booke.c
index b23cd54603f4..dec3f50a494f 100644
--- a/trunk/arch/powerpc/kvm/booke.c
+++ b/trunk/arch/powerpc/kvm/booke.c
@@ -528,7 +528,7 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)
 	vcpu->arch.ctr = regs->ctr;
 	vcpu->arch.lr = regs->lr;
 	vcpu->arch.xer = regs->xer;
-	vcpu->arch.msr = regs->msr;
+	kvmppc_set_msr(vcpu, regs->msr);
 	vcpu->arch.srr0 = regs->srr0;
 	vcpu->arch.srr1 = regs->srr1;
 	vcpu->arch.sprg0 = regs->sprg0;