diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-01-24 02:14:25 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-01-24 02:14:25 -0500 |
| commit | e47b207a5bcb73bb097f94d9fe364f50737b0eb2 (patch) | |
| tree | 57389653c37d001de3a90655cb4172ba29199ce4 /drivers/kvm/kvm_main.c | |
| parent | d344bff9c36db17dc4765215495aaa7212c1eb6c (diff) | |
| parent | 419dd8378dfa32985672ab7927b4bc827f33b332 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/kvm/kvm_main.c')
| -rw-r--r-- | drivers/kvm/kvm_main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c index 67c1154960f0..be4651abe72c 100644 --- a/drivers/kvm/kvm_main.c +++ b/drivers/kvm/kvm_main.c | |||
| @@ -272,7 +272,9 @@ static void kvm_free_physmem(struct kvm *kvm) | |||
| 272 | 272 | ||
| 273 | static void kvm_free_vcpu(struct kvm_vcpu *vcpu) | 273 | static void kvm_free_vcpu(struct kvm_vcpu *vcpu) |
| 274 | { | 274 | { |
| 275 | vcpu_load(vcpu->kvm, vcpu_slot(vcpu)); | ||
| 275 | kvm_mmu_destroy(vcpu); | 276 | kvm_mmu_destroy(vcpu); |
| 277 | vcpu_put(vcpu); | ||
| 276 | kvm_arch_ops->vcpu_free(vcpu); | 278 | kvm_arch_ops->vcpu_free(vcpu); |
| 277 | } | 279 | } |
| 278 | 280 | ||