diff mbox

[v2,3/9] KVM: remove #ifndef CONFIG_S390 around kvm_vcpu_wake_up

Message ID 20170426203227.12321-4-rkrcmar@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Radim Krčmář April 26, 2017, 8:32 p.m. UTC 
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(-)

Comments

Cornelia Huck April 27, 2017, 11:45 a.m. UTC | #1 
On Wed, 26 Apr 2017 22:32:21 +0200
Radim Krčmář <rkrcmar@redhat.com> 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(-)

Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Radim Krčmář May 3, 2017, 4:05 p.m. UTC | #2 
2017-04-26 22:32+0200, Radim Krčmář:
> The #ifndef was protecting a missing halt_wakeup stat, but that is no
> longer necessary.

It was also protecting smp_send_reschedule() in kvm_vcpu_kick() and I
didn't include Christian's patch that exported it and also missed the
warning.  Going to send v3 of this patch that removes the ifdef really
only around kvm_vcpu_wake_up().

Sorry for that.

> 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 357e67cba32e..e5d52b46b531 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)
>  {
> -- 
> 2.12.2
>
diff mbox

Patch

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 357e67cba32e..e5d52b46b531 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)
 {