From c8e4aa82c24d02bd6401a56a87aa1200861eff5e Mon Sep 17 00:00:00 2001
From: Hollis Blanchard <hollisb@us.ibm.com>
Date: Mon, 19 Nov 2007 14:04:43 -0600
Subject: [PATCH] --- yaml --- r: 80749 b: refs/heads/master c:
 d40ccc6246ed19ca529043998942a6b450c0e498 h: refs/heads/master i:   80747:
 a62a5514d3e352e569fe36c8ff1d72a375215429 v: v3

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

diff --git a/[refs] b/[refs]
index d5e51bc4812f..4c74f24ad8dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00fc9f5ae5988fb180f5a288451a741b35cc806e
+refs/heads/master: d40ccc6246ed19ca529043998942a6b450c0e498
diff --git a/trunk/drivers/kvm/kvm.h b/trunk/drivers/kvm/kvm.h
index ba78a45811cd..ccba9584355c 100644
--- a/trunk/drivers/kvm/kvm.h
+++ b/trunk/drivers/kvm/kvm.h
@@ -461,7 +461,7 @@ void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu);
 void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu);
 void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu);
 struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id);
-void kvm_arch_vcpu_destory(struct kvm_vcpu *vcpu);
+void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu);
 
 int kvm_arch_vcpu_reset(struct kvm_vcpu *vcpu);
 void kvm_arch_hardware_enable(void *garbage);
diff --git a/trunk/drivers/kvm/kvm_main.c b/trunk/drivers/kvm/kvm_main.c
index e83a178dc80f..4e1bd9488470 100644
--- a/trunk/drivers/kvm/kvm_main.c
+++ b/trunk/drivers/kvm/kvm_main.c
@@ -824,7 +824,7 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, int n)
 	kvm->vcpus[n] = NULL;
 	mutex_unlock(&kvm->lock);
 vcpu_destroy:
-	kvm_arch_vcpu_destory(vcpu);
+	kvm_arch_vcpu_destroy(vcpu);
 	return r;
 }
 
diff --git a/trunk/drivers/kvm/x86.c b/trunk/drivers/kvm/x86.c
index 2257a0aab32f..5a1b72fbaeaa 100644
--- a/trunk/drivers/kvm/x86.c
+++ b/trunk/drivers/kvm/x86.c
@@ -2513,7 +2513,7 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,
 	return ERR_PTR(r);
 }
 
-void kvm_arch_vcpu_destory(struct kvm_vcpu *vcpu)
+void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)
 {
 	vcpu_load(vcpu);
 	kvm_mmu_unload(vcpu);