[PATCH v3] KVM: remove #ifndef CONFIG_S390 around kvm_vcpu_wake_up

Radim Krčmář
2017-05-03T16:17:02Z

The #ifndef was protecting a missing halt_wakeup stat, but that is no
longer necessary. The #ifndef around kvm_vcpu_kick is still necessary
as s390 does not export smp_send_reschedule.

Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
---
v3: kept kvm_vcpu_kick() under the #ifndef and compile tested with kvm
configured as module too ...

virt/kvm/kvm_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 357e67cba32e..7112889e5e1a 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -2195,7 +2195,6 @@ void kvm_vcpu_block(struct kvm_vcpu *vcpu)
}
EXPORT_SYMBOL_GPL(kvm_vcpu_block);

-#ifndef CONFIG_S390
void kvm_vcpu_wake_up(struct kvm_vcpu *vcpu)
{
struct swait_queue_head *wqp;
@@ -2209,6 +2208,7 @@ void kvm_vcpu_wake_up(struct kvm_vcpu *vcpu)
}
EXPORT_SYMBOL_GPL(kvm_vcpu_wake_up);

+#ifndef CONFIG_S390
/*
* Kick a sleeping VCPU, or a guest VCPU in guest mode, into host kernel mode.
*/
--
2.12.2