From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1753681AbdECQGE (ORCPT <rfc822;w@1wt.eu>);
        Wed, 3 May 2017 12:06:04 -0400
Received: from mx1.redhat.com ([209.132.183.28]:51420 "EHLO mx1.redhat.com"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1753474AbdECQFn (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 3 May 2017 12:05:43 -0400
DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com BC1344E4C8
Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com
Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=rkrcmar@redhat.com
DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com BC1344E4C8
Date: Wed, 3 May 2017 18:05:33 +0200
From: Radim =?utf-8?B?S3LEjW3DocWZ?= <rkrcmar@redhat.com>
To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org
Cc: Christoffer Dall <cdall@linaro.org>, Andrew Jones <drjones@redhat.com>,
        Marc Zyngier <marc.zyngier@arm.com>,
        Paolo Bonzini <pbonzini@redhat.com>,
        Christian Borntraeger <borntraeger@de.ibm.com>,
        Cornelia Huck <cornelia.huck@de.ibm.com>,
        James Hogan <james.hogan@imgtec.com>,
        Paul Mackerras <paulus@ozlabs.org>
Subject: Re: [PATCH v2 3/9] KVM: remove #ifndef CONFIG_S390 around
 kvm_vcpu_wake_up
Message-ID: <20170503160532.GB26679@potion>
References: <20170426203227.12321-1-rkrcmar@redhat.com>
 <20170426203227.12321-4-rkrcmar@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <20170426203227.12321-4-rkrcmar@redhat.com>
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 03 May 2017 16:05:38 +0000 (UTC)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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
>