From eed11721a1edf1c9c71ceddf96179b16c153de97 Mon Sep 17 00:00:00 2001
From: Gleb Natapov <gleb@redhat.com>
Date: Tue, 7 Oct 2008 15:42:33 +0200
Subject: [PATCH] --- yaml --- r: 125183 b: refs/heads/master c:
 5f179287fa02723215eecf681d812b303c243973 h: refs/heads/master i:   125181:
 9bdc771016adc307a8b450cdb07ff6714a9bbb22   125179:
 f89959c3cafb6e9b1c023e590e6c17938b8f2099   125175:
 46f6d84edfab4889fdedcfb00c1c5a1b76c0a9c1   125167:
 9ab3ed71eeef451abd31ef6e08fc9e573d0c2812   125151:
 00be6a8e2832a0f104becfd83b6553991500dce5   125119:
 437cb9f95d5a1179b51ed62e2ae7c204abf38a77   125055:
 776edea0fa6e1ddebdc2dafcf8a416fb8b7ad55c   124927:
 b705b13ea68f6eaf64b3148df179ea14f1d659f9 v: v3

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

diff --git a/[refs] b/[refs]
index 746bf6b2e11c..91c685f3be5b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b86cd9967242f3f3d775ee015fb814a349ed5e6
+refs/heads/master: 5f179287fa02723215eecf681d812b303c243973
diff --git a/trunk/arch/x86/kvm/x86.c b/trunk/arch/x86/kvm/x86.c
index 07971451b947..a2c4b5594555 100644
--- a/trunk/arch/x86/kvm/x86.c
+++ b/trunk/arch/x86/kvm/x86.c
@@ -3010,7 +3010,7 @@ static int __vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 		pr_debug("vcpu %d received sipi with vector # %x\n",
 			 vcpu->vcpu_id, vcpu->arch.sipi_vector);
 		kvm_lapic_reset(vcpu);
-		r = kvm_x86_ops->vcpu_reset(vcpu);
+		r = kvm_arch_vcpu_reset(vcpu);
 		if (r)
 			return r;
 		vcpu->arch.mp_state = KVM_MP_STATE_RUNNABLE;