---

yaml --- r: 271487 b: refs/heads/master c: cf3ace7 h: refs/heads/master i: 271485: 8f9c50b 271483: b877ad2 271479: edc8d3e 271471: c0490e6 271455: 4213a89 271423: dc34bc4 271359: 475eba0 v: v3
git-mirror · Sep 25, 2011 · ffecfe7 · ffecfe7
1 parent 9f19d90
commit ffecfe7
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: 742bc67042e34a9fe1fed0b46e4cb1431a72c4bf
+refs/heads/master: cf3ace79c065d65e9636f719a9df1382725410e3
diff --git a/trunk/arch/x86/kvm/vmx.c b/trunk/arch/x86/kvm/vmx.c
@@ -4115,8 +4115,7 @@ static int handle_exception(struct kvm_vcpu *vcpu)
 		error_code = vmcs_read32(VM_EXIT_INTR_ERROR_CODE);
 	if (is_page_fault(intr_info)) {
 		/* EPT won't cause page fault directly */
-		if (enable_ept)
-			BUG();
+		BUG_ON(enable_ept);
 		cr2 = vmcs_readl(EXIT_QUALIFICATION);
 		trace_kvm_page_fault(cr2, error_code);