Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754757AbdDGLBg (ORCPT ); Fri, 7 Apr 2017 07:01:36 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:53691 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750705AbdDGLBb (ORCPT ); Fri, 7 Apr 2017 07:01:31 -0400 Subject: Re: [PATCH 4/6] KVM: remove #ifndef CONFIG_S390 around kvm_vcpu_wake_up To: =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= , linux-kernel@vger.kernel.org, kvm@vger.kernel.org References: <20170406202056.18379-1-rkrcmar@redhat.com> <20170406202056.18379-5-rkrcmar@redhat.com> Cc: Christoffer Dall , Andrew Jones , Marc Zyngier , Paolo Bonzini , Cornelia Huck , James Hogan , Paul Mackerras From: Christian Borntraeger Date: Fri, 7 Apr 2017 13:01:22 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <20170406202056.18379-5-rkrcmar@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 x-cbid: 17040711-0048-0000-0000-000001502978 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00006892; HX=3.00000240; KW=3.00000007; PH=3.00000004; SC=3.00000208; SDB=6.00844232; UDB=6.00416125; IPR=6.00622530; BA=6.00005275; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00014947; XFM=3.00000013; UTC=2017-04-07 11:01:27 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17040711-0049-0000-0000-0000404F74DD Message-Id: <812ae94b-a2a8-e599-76ae-1a446ac6f1a8@de.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-04-07_10:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1702020001 definitions=main-1704070092 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 919 Lines: 33 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 > > Signed-off-by: Radim Krčmář > --- > 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) > { >