From: Avi Kivity <avi@qumranet.com>
Date: Wed, 13 Dec 2006 08:34:01 +0000 (-0800)
Subject: [PATCH] KVM: Remove extranous put_cpu() from vcpu_put()
X-Git-Tag: v2.6.20-rc1~126
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=0770b19b94ed8fc97e1fcac91c320ec738919628;p=~emulex%2Finfiniband.git

[PATCH] KVM: Remove extranous put_cpu() from vcpu_put()

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>
---

diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index 088a445d1df..fd1bb870545 100644
--- a/drivers/kvm/kvm_main.c
+++ b/drivers/kvm/kvm_main.c
@@ -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);
 }