diff options
author | Avi Kivity <avi@qumranet.com> | 2006-12-13 00:34:01 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-13 09:05:47 -0800 |
commit | 0770b19b94ed8fc97e1fcac91c320ec738919628 (patch) | |
tree | f42920008f93f05ab961832b2c870a00bfb0cecf | |
parent | 7725f0badd6682e5bcc06f38eedf0123712a3f60 (diff) | |
download | kernel-crypto-0770b19b94ed8fc97e1fcac91c320ec738919628.tar.gz kernel-crypto-0770b19b94ed8fc97e1fcac91c320ec738919628.tar.xz kernel-crypto-0770b19b94ed8fc97e1fcac91c320ec738919628.zip |
[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>
-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 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); } |