From 88f87ad8d072698902bf52b24d45e4f5ab66e5eb Mon Sep 17 00:00:00 2001
From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Sat, 23 Feb 2013 22:35:37 +0100
Subject: [PATCH] --- yaml --- r: 372951 b: refs/heads/master c:
 36c3cc422b7c5d3cd84cbac769758b197e08f221 h: refs/heads/master i:   372949:
 7f1ca405e5579f5de4604f18f3a43b66685dca89   372947:
 408349b499a039ecd4d54a34450c7c2f882003f3   372943:
 06f0f4f1fd483fff14f3849d4bcebedac901b977 v: v3

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

diff --git a/[refs] b/[refs]
index 7bea892f250a..7ea0afa29f9d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6851fbeee3f79ac2629f823e15ac2a7f6f54e0e
+refs/heads/master: 36c3cc422b7c5d3cd84cbac769758b197e08f221
diff --git a/trunk/arch/x86/kvm/vmx.c b/trunk/arch/x86/kvm/vmx.c
index 329836af3240..3a58c1b8764e 100644
--- a/trunk/arch/x86/kvm/vmx.c
+++ b/trunk/arch/x86/kvm/vmx.c
@@ -7271,6 +7271,8 @@ static int nested_vmx_run(struct kvm_vcpu *vcpu, bool launch)
 	vcpu->cpu = cpu;
 	put_cpu();
 
+	vmx_segment_cache_clear(vmx);
+
 	vmcs12->launch_state = 1;
 
 	prepare_vmcs02(vcpu, vmcs12);
@@ -7517,6 +7519,8 @@ static void nested_vmx_vmexit(struct kvm_vcpu *vcpu)
 	vcpu->cpu = cpu;
 	put_cpu();
 
+	vmx_segment_cache_clear(vmx);
+
 	/* if no vmcs02 cache requested, remove the one we used */
 	if (VMCS02_POOL_SIZE == 0)
 		nested_free_vmcs02(vmx, vmx->nested.current_vmptr);