[PATCH] KVM: Remove extranous put_cpu() from vcpu_put()
authorAvi Kivity <avi@qumranet.com>
Wed, 13 Dec 2006 08:34:01 +0000 (00:34 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Wed, 13 Dec 2006 17:05:47 +0000 (09:05 -0800)
The arch splitting patchset left an extra put_cpu() in core code, where it can
cause trouble for CONFIG_PREEMPT kernels.

Reported-by: Huihong Luo <huisinro@yahoo.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/kvm/kvm_main.c

index 088a445d1df7f16582bafd8cf19b8ea7df1e3092..fd1bb870545c28adc3fa8c4bb7927046504e67e8 100644 (file)
@@ -205,7 +205,6 @@ static struct kvm_vcpu *vcpu_load(struct kvm *kvm, int vcpu_slot)
 static void vcpu_put(struct kvm_vcpu *vcpu)
 {
        kvm_arch_ops->vcpu_put(vcpu);
-       put_cpu();
        mutex_unlock(&vcpu->mutex);
 }