aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcelo Tosatti <mtosatti@redhat.com>2012-03-14 16:58:48 -0400
committerAvi Kivity <avi@redhat.com>2012-04-08 05:49:42 -0400
commit8c84780df909433777ea9463b8350bc0aab34940 (patch)
treefed18035eb4a6467b653629b2ca9e6646a02069a
parent5d1c0f4a80a6df73395fb3fc2c302510f8f09d36 (diff)
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>
-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)
1514 finish_wait(&vcpu->wq, &wait); 1514 finish_wait(&vcpu->wq, &wait);
1515} 1515}
1516 1516
1517#ifndef CONFIG_S390
1517/* 1518/*
1518 * Kick a sleeping VCPU, or a guest VCPU in guest mode, into host kernel mode. 1519 * Kick a sleeping VCPU, or a guest VCPU in guest mode, into host kernel mode.
1519 */ 1520 */
@@ -1535,6 +1536,7 @@ void kvm_vcpu_kick(struct kvm_vcpu *vcpu)
1535 smp_send_reschedule(cpu); 1536 smp_send_reschedule(cpu);
1536 put_cpu(); 1537 put_cpu();
1537} 1538}
1539#endif /* !CONFIG_S390 */
1538 1540
1539void kvm_resched(struct kvm_vcpu *vcpu) 1541void kvm_resched(struct kvm_vcpu *vcpu)
1540{ 1542{