From 01180ba8382a9ad933b71b78d5bdc9d8db4fb3bd Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 12 Feb 2007 00:54:42 -0800
Subject: [PATCH] --- yaml --- r: 48040 b: refs/heads/master c:
 1e8ba6fba5050ec11bba90c8622aa2ed95ff711f h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/kvm/kvm_main.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 66b30094155a..4179b962a05a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8cd133073f9b5cd335c0b2e4740aceb025d50ca9
+refs/heads/master: 1e8ba6fba5050ec11bba90c8622aa2ed95ff711f
diff --git a/trunk/drivers/kvm/kvm_main.c b/trunk/drivers/kvm/kvm_main.c
index eb3931ca680a..9b79d3451f6f 100644
--- a/trunk/drivers/kvm/kvm_main.c
+++ b/trunk/drivers/kvm/kvm_main.c
@@ -272,7 +272,9 @@ static void kvm_free_physmem(struct kvm *kvm)
 
 static void kvm_free_vcpu(struct kvm_vcpu *vcpu)
 {
-	vcpu_load(vcpu->kvm, vcpu_slot(vcpu));
+	if (!vcpu_load(vcpu->kvm, vcpu_slot(vcpu)))
+		return;
+
 	kvm_mmu_destroy(vcpu);
 	vcpu_put(vcpu);
 	kvm_arch_ops->vcpu_free(vcpu);