diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2017-05-04 15:14:13 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2017-05-04 15:14:13 +0200 |
| commit | 0266c894b51c41d3161adb90e3c15eda3e90a7be (patch) | |
| tree | 557790483e05f53dd81818c9ab99fd89f08b78a7 /virt | |
| parent | 4e335d9e7ddbcf83d03e7fbe65797ebed2272c18 (diff) | |
| download | linux-stable-0266c894b51c41d3161adb90e3c15eda3e90a7be.tar.gz linux-stable-0266c894b51c41d3161adb90e3c15eda3e90a7be.tar.bz2 linux-stable-0266c894b51c41d3161adb90e3c15eda3e90a7be.zip | |
KVM: put back #ifndef CONFIG_S390 around kvm_vcpu_kick
The #ifndef was removed in 75aaafb79f73516b69d5639ad30a72d72e75c8b4,
but it was also protecting smp_send_reschedule() in kvm_vcpu_kick().
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'virt')
| -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 4c4d3fe10654..6e3b12c1925a 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -2229,6 +2229,7 @@ bool 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. */ @@ -2247,6 +2248,7 @@ void kvm_vcpu_kick(struct kvm_vcpu *vcpu) put_cpu(); } EXPORT_SYMBOL_GPL(kvm_vcpu_kick); +#endif /* !CONFIG_S390 */ int kvm_vcpu_yield_to(struct kvm_vcpu *target) { |