From: Marcelo Tosatti <mtosatti@redhat.com>
Date: Wed, 14 Mar 2012 20:58:48 +0000 (-0300)
Subject: KVM: fix kvm_vcpu_kick build failure on S390
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=8c84780df909433777ea9463b8350bc0aab34940;p=linux-edison.git

KVM: fix kvm_vcpu_kick build failure on S390

S390's kvm_vcpu_stat does not contain halt_wakeup member.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
---

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 7149a2e6552..a612bc8c921 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1514,6 +1514,7 @@ void kvm_vcpu_block(struct kvm_vcpu *vcpu)
 	finish_wait(&vcpu->wq, &wait);
 }
 
+#ifndef CONFIG_S390
 /*
  * Kick a sleeping VCPU, or a guest VCPU in guest mode, into host kernel mode.
  */
@@ -1535,6 +1536,7 @@ void kvm_vcpu_kick(struct kvm_vcpu *vcpu)
 			smp_send_reschedule(cpu);
 	put_cpu();
 }
+#endif /* !CONFIG_S390 */
 
 void kvm_resched(struct kvm_vcpu *vcpu)
 {