From 023bddc172592b86bd6619b562f590b51beaf2cd Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Thu, 20 Sep 2012 19:36:32 +0000 Subject: [PATCH] --- yaml --- r: 343489 b: refs/heads/master c: 964ee98ccde0534548565a201827cf06d813180f h: refs/heads/master i: 343487: f1cce6d5a3a51f68bd051cc2cdca0a2475a57849 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kvm/book3s_hv.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index e03574713476..b423c15b5df2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a47d72f3613d5edfd8e752c9b804d7df35810649 +refs/heads/master: 964ee98ccde0534548565a201827cf06d813180f diff --git a/trunk/arch/powerpc/kvm/book3s_hv.c b/trunk/arch/powerpc/kvm/book3s_hv.c index 38c7f1bc3495..c9ae3148c981 100644 --- a/trunk/arch/powerpc/kvm/book3s_hv.c +++ b/trunk/arch/powerpc/kvm/book3s_hv.c @@ -706,17 +706,11 @@ extern void xics_wake_cpu(int cpu); static void kvmppc_remove_runnable(struct kvmppc_vcore *vc, struct kvm_vcpu *vcpu) { - struct kvm_vcpu *v; - if (vcpu->arch.state != KVMPPC_VCPU_RUNNABLE) return; vcpu->arch.state = KVMPPC_VCPU_BUSY_IN_HOST; --vc->n_runnable; ++vc->n_busy; - /* decrement the physical thread id of each following vcpu */ - v = vcpu; - list_for_each_entry_continue(v, &vc->runnable_threads, arch.run_list) - --v->arch.ptid; list_del(&vcpu->arch.run_list); }