From ffecfe70e10bd6eef08fbbc6209dc95a06f7f04d Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Tue, 2 Aug 2011 12:34:57 +0200
Subject: [PATCH] --- yaml --- r: 271487 b: refs/heads/master c:
 cf3ace79c065d65e9636f719a9df1382725410e3 h: refs/heads/master i:   271485:
 8f9c50bb0908d298ca5e02a33dfaecfdac23a35a   271483:
 b877ad22b09d899c78a197203cd5bac586b1077f   271479:
 edc8d3e117b0f3ed27776292140bd42173d3a585   271471:
 c0490e6f216b77480df3dcf1c75456a36356a78d   271455:
 4213a8941e3cbabc3a6ebeb763e3d1b4a276a703   271423:
 dc34bc494a2736a16495ccd58b009dea420b5eb5   271359:
 475eba0b182f10222f01afb4e9d734671aca675a v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/kvm/vmx.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7e88b4341598..e36a830168fd 100644
--- 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
index e26629fbf1d7..03df703c8f20 100644
--- 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);