From ba9e20b5f8cbf3f0423ff5a6c8f2f56c2602cb35 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@qumranet.com>
Date: Sun, 28 Oct 2007 18:52:05 +0200
Subject: [PATCH] --- yaml --- r: 80689 b: refs/heads/master c:
 b733bfb524af69612f85c36a511f0109c5e3fe8d h: refs/heads/master i:   80687:
 e7e657ec98f50bb485840a9e9ce871aa2546a908 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/kvm/mmu.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9171d946dc52..1f57b6ce2fa4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3067714cf59bd4a6dbf788b709485bc62c1ff845
+refs/heads/master: b733bfb524af69612f85c36a511f0109c5e3fe8d
diff --git a/trunk/drivers/kvm/mmu.c b/trunk/drivers/kvm/mmu.c
index ace3cb86214b..9be54a5e858e 100644
--- a/trunk/drivers/kvm/mmu.c
+++ b/trunk/drivers/kvm/mmu.c
@@ -1362,6 +1362,10 @@ int kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gva_t cr2, u32 error_code)
 		goto out;
 	}
 
+	r = mmu_topup_memory_caches(vcpu);
+	if (r)
+		goto out;
+
 	er = emulate_instruction(vcpu, vcpu->run, cr2, error_code, 0);
 	mutex_unlock(&vcpu->kvm->lock);