From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Subject: [PATCH v3] KVM: remove #ifndef CONFIG_S390 around kvm_vcpu_wake_up Date: Wed, 3 May 2017 18:16:34 +0200 Message-ID: <20170503161634.6056-1-rkrcmar@redhat.com> References: <20170426203227.12321-4-rkrcmar@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Christoffer Dall , Andrew Jones , Marc Zyngier , Paolo Bonzini , Christian Borntraeger , Cornelia Huck , James Hogan , Paul Mackerras To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:35720 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750919AbdECQRC (ORCPT ); Wed, 3 May 2017 12:17:02 -0400 In-Reply-To: <20170426203227.12321-4-rkrcmar@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: The #ifndef was protecting a missing halt_wakeup stat, but that is no longer necessary. The #ifndef around kvm_vcpu_kick is still necessary as s390 does not export smp_send_reschedule. Signed-off-by: Radim Krčmář --- v3: kept kvm_vcpu_kick() under the #ifndef and compile tested with kvm configured as module too ... virt/kvm/kvm_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 357e67cba32e..7112889e5e1a 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; @@ -2209,6 +2208,7 @@ void 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. */ -- 2.12.2