---

yaml --- r: 202231 b: refs/heads/master c: c332c83 h: refs/heads/master i: 202229: 0746cd7 202227: f1d714c 202223: 156d7af v: v3
git-mirror · Aug 1, 2010 · 1cbe2f5 · 1cbe2f5
1 parent be6d6d8
commit 1cbe2f5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf998156d24bcb127318ad5bf531ac3bdfcd6449
+refs/heads/master: c332c83ae736c72dcf072e96e98a774fce39e722
diff --git a/trunk/arch/x86/kvm/vmx.c b/trunk/arch/x86/kvm/vmx.c
@@ -2826,9 +2826,7 @@ static bool vmx_get_nmi_mask(struct kvm_vcpu *vcpu)
 {
 	if (!cpu_has_virtual_nmis())
 		return to_vmx(vcpu)->soft_vnmi_blocked;
-	else
-		return !!(vmcs_read32(GUEST_INTERRUPTIBILITY_INFO) &
-			  GUEST_INTR_STATE_NMI);
+	return vmcs_read32(GUEST_INTERRUPTIBILITY_INFO)	& GUEST_INTR_STATE_NMI;
 }
 
 static void vmx_set_nmi_mask(struct kvm_vcpu *vcpu, bool masked)