From d976f62d28bd030e0567eb3e3ce128b37c3f493b Mon Sep 17 00:00:00 2001 From: Bharat Bhushan Date: Thu, 13 Oct 2011 15:17:08 +0530 Subject: [PATCH] --- yaml --- r: 297073 b: refs/heads/master c: f9208427f72e6cb52c71767af3bf8c14c43c27ac h: refs/heads/master i: 297071: 0363bf39c4a07d55ea0a11f8b0bc9c68af726317 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/kvm_emul.S | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index d01ecf0ad4e0..906ca0bdd552 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 95325e6b190bb4ec3383aa1241d10675057bff45 +refs/heads/master: f9208427f72e6cb52c71767af3bf8c14c43c27ac diff --git a/trunk/arch/powerpc/kernel/kvm_emul.S b/trunk/arch/powerpc/kernel/kvm_emul.S index f2b1b2523e61..3d64c5704fd5 100644 --- a/trunk/arch/powerpc/kernel/kvm_emul.S +++ b/trunk/arch/powerpc/kernel/kvm_emul.S @@ -167,6 +167,9 @@ maybe_stay_in_guest: kvm_emulate_mtmsr_reg2: ori r30, r0, 0 + /* Put MSR into magic page because we don't call mtmsr */ + STL64(r30, KVM_MAGIC_PAGE + KVM_MAGIC_MSR, 0) + /* Check if we have to fetch an interrupt */ lwz r31, (KVM_MAGIC_PAGE + KVM_MAGIC_INT)(0) cmpwi r31, 0 @@ -174,15 +177,10 @@ kvm_emulate_mtmsr_reg2: /* Check if we may trigger an interrupt */ andi. r31, r30, MSR_EE - beq no_mtmsr - - b do_mtmsr + bne do_mtmsr no_mtmsr: - /* Put MSR into magic page because we don't call mtmsr */ - STL64(r30, KVM_MAGIC_PAGE + KVM_MAGIC_MSR, 0) - SCRATCH_RESTORE /* Go back to caller */