]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
KVM: remove #ifndef CONFIG_S390 around kvm_vcpu_wake_up
authorRadim Krčmář <rkrcmar@redhat.com>
Wed, 26 Apr 2017 20:32:21 +0000 (22:32 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Thu, 27 Apr 2017 12:13:32 +0000 (14:13 +0200)
The #ifndef was protecting a missing halt_wakeup stat, but that is no
longer necessary.

Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
virt/kvm/kvm_main.c

index 357e67cba32eeddab73323356dbdc79d5736ae24..e5d52b46b531d438dcc26fdb49214091ca5bae4c 100644 (file)
@@ -2195,7 +2195,6 @@ out:
 }
 EXPORT_SYMBOL_GPL(kvm_vcpu_block);
 
-#ifndef CONFIG_S390
 void kvm_vcpu_wake_up(struct kvm_vcpu *vcpu)
 {
        struct swait_queue_head *wqp;
@@ -2225,7 +2224,6 @@ void kvm_vcpu_kick(struct kvm_vcpu *vcpu)
        put_cpu();
 }
 EXPORT_SYMBOL_GPL(kvm_vcpu_kick);
-#endif /* !CONFIG_S390 */
 
 int kvm_vcpu_yield_to(struct kvm_vcpu *target)
 {