summaryrefslogtreecommitdiffstats
path: root/virt
diff options
context:
space:
mode:
authorMarcelo Tosatti <mtosatti@redhat.com>2012-03-14 17:58:48 -0300
committerAvi Kivity <avi@redhat.com>2012-04-08 12:49:42 +0300
commit8c84780df909433777ea9463b8350bc0aab34940 (patch)
treefed18035eb4a6467b653629b2ca9e6646a02069a /virt
parent5d1c0f4a80a6df73395fb3fc2c302510f8f09d36 (diff)
downloadlinux-stable-8c84780df909433777ea9463b8350bc0aab34940.tar.gz
linux-stable-8c84780df909433777ea9463b8350bc0aab34940.tar.bz2
linux-stable-8c84780df909433777ea9463b8350bc0aab34940.zip
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>
Diffstat (limited to 'virt')
-rw-r--r--virt/kvm/kvm_main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 7149a2e65524..a612bc8c921c 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)
{