diff options
author | Avi Kivity <avi@qumranet.com> | 2006-12-13 03:34:01 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-13 12:05:47 -0500 |
commit | 0770b19b94ed8fc97e1fcac91c320ec738919628 (patch) | |
tree | f42920008f93f05ab961832b2c870a00bfb0cecf /drivers/kvm | |
parent | 7725f0badd6682e5bcc06f38eedf0123712a3f60 (diff) |
[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>
Diffstat (limited to 'drivers/kvm')
-rw-r--r-- | drivers/kvm/kvm_main.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c index 088a445d1df7..fd1bb870545c 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) | |||
205 | static void vcpu_put(struct kvm_vcpu *vcpu) | 205 | static void vcpu_put(struct kvm_vcpu *vcpu) |
206 | { | 206 | { |
207 | kvm_arch_ops->vcpu_put(vcpu); | 207 | kvm_arch_ops->vcpu_put(vcpu); |
208 | put_cpu(); | ||
209 | mutex_unlock(&vcpu->mutex); | 208 | mutex_unlock(&vcpu->mutex); |
210 | } | 209 | } |
211 | 210 | ||