aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/kvm/kvm-ia64.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/ia64/kvm/kvm-ia64.c')
-rw-r--r--arch/ia64/kvm/kvm-ia64.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
index 4082665ace0a..d1f7bcda2c7f 100644
--- a/arch/ia64/kvm/kvm-ia64.c
+++ b/arch/ia64/kvm/kvm-ia64.c
@@ -338,7 +338,7 @@ static struct kvm_vcpu *lid_to_vcpu(struct kvm *kvm, unsigned long id,
338 union ia64_lid lid; 338 union ia64_lid lid;
339 int i; 339 int i;
340 340
341 for (i = 0; i < kvm->arch.online_vcpus; i++) { 341 for (i = 0; i < atomic_read(&kvm->online_vcpus); i++) {
342 if (kvm->vcpus[i]) { 342 if (kvm->vcpus[i]) {
343 lid.val = VCPU_LID(kvm->vcpus[i]); 343 lid.val = VCPU_LID(kvm->vcpus[i]);
344 if (lid.id == id && lid.eid == eid) 344 if (lid.id == id && lid.eid == eid)
@@ -412,7 +412,7 @@ static int handle_global_purge(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
412 412
413 call_data.ptc_g_data = p->u.ptc_g_data; 413 call_data.ptc_g_data = p->u.ptc_g_data;
414 414
415 for (i = 0; i < kvm->arch.online_vcpus; i++) { 415 for (i = 0; i < atomic_read(&kvm->online_vcpus); i++) {
416 if (!kvm->vcpus[i] || kvm->vcpus[i]->arch.mp_state == 416 if (!kvm->vcpus[i] || kvm->vcpus[i]->arch.mp_state ==
417 KVM_MP_STATE_UNINITIALIZED || 417 KVM_MP_STATE_UNINITIALIZED ||
418 vcpu == kvm->vcpus[i]) 418 vcpu == kvm->vcpus[i])
@@ -852,8 +852,6 @@ struct kvm *kvm_arch_create_vm(void)
852 852
853 kvm_init_vm(kvm); 853 kvm_init_vm(kvm);
854 854
855 kvm->arch.online_vcpus = 0;
856
857 return kvm; 855 return kvm;
858 856
859} 857}
@@ -1356,8 +1354,6 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,
1356 goto fail; 1354 goto fail;
1357 } 1355 }
1358 1356
1359 kvm->arch.online_vcpus++;
1360
1361 return vcpu; 1357 return vcpu;
1362fail: 1358fail:
1363 return ERR_PTR(r); 1359 return ERR_PTR(r);