diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2017-05-04 09:14:13 -0400 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2017-05-04 09:14:13 -0400 |
commit | 0266c894b51c41d3161adb90e3c15eda3e90a7be (patch) | |
tree | 557790483e05f53dd81818c9ab99fd89f08b78a7 | |
parent | 4e335d9e7ddbcf83d03e7fbe65797ebed2272c18 (diff) |
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>
-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) | |||
2229 | } | 2229 | } |
2230 | EXPORT_SYMBOL_GPL(kvm_vcpu_wake_up); | 2230 | EXPORT_SYMBOL_GPL(kvm_vcpu_wake_up); |
2231 | 2231 | ||
2232 | #ifndef CONFIG_S390 | ||
2232 | /* | 2233 | /* |
2233 | * Kick a sleeping VCPU, or a guest VCPU in guest mode, into host kernel mode. | 2234 | * Kick a sleeping VCPU, or a guest VCPU in guest mode, into host kernel mode. |
2234 | */ | 2235 | */ |
@@ -2247,6 +2248,7 @@ void kvm_vcpu_kick(struct kvm_vcpu *vcpu) | |||
2247 | put_cpu(); | 2248 | put_cpu(); |
2248 | } | 2249 | } |
2249 | EXPORT_SYMBOL_GPL(kvm_vcpu_kick); | 2250 | EXPORT_SYMBOL_GPL(kvm_vcpu_kick); |
2251 | #endif /* !CONFIG_S390 */ | ||
2250 | 2252 | ||
2251 | int kvm_vcpu_yield_to(struct kvm_vcpu *target) | 2253 | int kvm_vcpu_yield_to(struct kvm_vcpu *target) |
2252 | { | 2254 | { |