Message ID | 20170406202056.18379-5-rkrcmar@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 04/06/2017 10:20 PM, Radim Krčmář wrote: > The #ifndef was protecting a missing halt_wakeup stat, but that is no > longer necessary. Acked-by: Christian Borntraeger <borntraeger@de.ibm.com> > > Signed-off-by: Radim Krčmář <rkrcmar@redhat.com> > --- > virt/kvm/kvm_main.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c > index 2389e9c41cd2..a486c6ad27a6 100644 > --- a/virt/kvm/kvm_main.c > +++ b/virt/kvm/kvm_main.c > @@ -2195,7 +2195,6 @@ void kvm_vcpu_block(struct kvm_vcpu *vcpu) > } > EXPORT_SYMBOL_GPL(kvm_vcpu_block); > > -#ifndef CONFIG_S390 > void kvm_vcpu_wake_up(struct kvm_vcpu *vcpu) > { > struct swait_queue_head *wqp; > @@ -2225,7 +2224,6 @@ 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) > { >
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 2389e9c41cd2..a486c6ad27a6 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -2195,7 +2195,6 @@ void kvm_vcpu_block(struct kvm_vcpu *vcpu) } EXPORT_SYMBOL_GPL(kvm_vcpu_block); -#ifndef CONFIG_S390 void kvm_vcpu_wake_up(struct kvm_vcpu *vcpu) { struct swait_queue_head *wqp; @@ -2225,7 +2224,6 @@ 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) {
The #ifndef was protecting a missing halt_wakeup stat, but that is no longer necessary. Signed-off-by: Radim Krčmář <rkrcmar@redhat.com> --- virt/kvm/kvm_main.c | 2 -- 1 file changed, 2 deletions(-)