---

yaml --- r: 190844 b: refs/heads/master c: f8c5fae h: refs/heads/master v: v3
git-mirror · May 13, 2010 · a8df0cb · a8df0cb
1 parent f6ce636
commit a8df0cb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe19c5a46b4c519153fddd4d5efe32a3e4cfa694
+refs/heads/master: f8c5fae16649445e15656667f72bd51d777f7766
diff --git a/trunk/arch/x86/kvm/vmx.c b/trunk/arch/x86/kvm/vmx.c
@@ -2703,8 +2703,7 @@ static int vmx_nmi_allowed(struct kvm_vcpu *vcpu)
 		return 0;
 
 	return	!(vmcs_read32(GUEST_INTERRUPTIBILITY_INFO) &
-			(GUEST_INTR_STATE_STI | GUEST_INTR_STATE_MOV_SS |
-				GUEST_INTR_STATE_NMI));
+			(GUEST_INTR_STATE_MOV_SS | GUEST_INTR_STATE_NMI));
 }
 
 static bool vmx_get_nmi_mask(struct kvm_vcpu *vcpu)