---

yaml --- r: 297073 b: refs/heads/master c: f920842 h: refs/heads/master i: 297071: 0363bf3 v: v3
git-mirror · Mar 5, 2012 · d976f62 · d976f62
1 parent dc6f2bd
commit d976f62
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git 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
@@ -167,22 +167,20 @@ 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
 	beq+	no_mtmsr
 
 	/* 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 */