diff options
author | Marcelo Tosatti <mtosatti@redhat.com> | 2012-03-14 16:58:48 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2012-04-08 05:49:42 -0400 |
commit | 8c84780df909433777ea9463b8350bc0aab34940 (patch) | |
tree | fed18035eb4a6467b653629b2ca9e6646a02069a /virt/kvm/kvm_main.c | |
parent | 5d1c0f4a80a6df73395fb3fc2c302510f8f09d36 (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>
Diffstat (limited to 'virt/kvm/kvm_main.c')
-rw-r--r-- | virt/kvm/kvm_main.c | 2 |
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 | ||
1539 | void kvm_resched(struct kvm_vcpu *vcpu) | 1541 | void kvm_resched(struct kvm_vcpu *vcpu) |
1540 | { | 1542 | { |