From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiko Carstens Subject: Re: [PATCH] KVM: s390: fix build failure Date: Wed, 8 Jun 2016 07:31:29 +0200 Message-ID: <20160608053129.GA3311@osiris> References: <1465336170-23064-1-git-send-email-sudipm.mukherjee@gmail.com> <5757AA6F.705@de.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Sudip Mukherjee , Cornelia Huck , Paolo Bonzini , Radim =?utf-8?B?S3LEjW3DocWZ?= , Martin Schwidefsky , linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, kvm@vger.kernel.org To: Christian Borntraeger , Stephen Rothwell Return-path: Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:1169 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161600AbcFHFbh (ORCPT ); Wed, 8 Jun 2016 01:31:37 -0400 Received: from pps.filterd (m0082756.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u585TYgM023793 for ; Wed, 8 Jun 2016 01:31:36 -0400 Received: from e06smtp08.uk.ibm.com (e06smtp08.uk.ibm.com [195.75.94.104]) by mx0a-001b2d01.pphosted.com with ESMTP id 23e9met7ua-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Wed, 08 Jun 2016 01:31:36 -0400 Received: from localhost by e06smtp08.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 8 Jun 2016 06:31:33 +0100 Content-Disposition: inline In-Reply-To: <5757AA6F.705@de.ibm.com> Sender: kvm-owner@vger.kernel.org List-ID: On Wed, Jun 08, 2016 at 07:17:35AM +0200, Christian Borntraeger wrote: > On 06/07/2016 11:49 PM, Sudip Mukherjee wrote: > > etr_ptff definitions are moved and renamed but we missed updating them > > here and as a result s390 defconfig and allmodconfig was failing with > > the error: > > arch/s390/kvm/kvm-s390.c:230:45: error: 'ETR_PTFF_QAF' undeclared > > > > Fixes: cc8f94656487 ("s390/time: move PTFF definitions") > > Signed-off-by: Sudip Mukherjee > > Thank you for the report and patch. > > This is linux-next only. Its a conflict between my kvms390 queue and > Martins s390 queue. We cannot apply this directly as it would break > the build of my tree when not merged in next. (and it does not apply > on Martins tree). > > I will have a look how to fix that up. We could ask Stephen Rothwell to apply the patch only to linux-next? ;) > > --- > > > > s390 defconfig build log is at: > > https://travis-ci.org/sudipm-mukherjee/parport/jobs/135776067 > > > > arch/s390/kvm/kvm-s390.c | 6 ++++-- > > 1 file changed, 4 insertions(+), 2 deletions(-) > > > > diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c > > index fa51aef..3039eaf 100644 > > --- a/arch/s390/kvm/kvm-s390.c > > +++ b/arch/s390/kvm/kvm-s390.c > > @@ -29,7 +29,7 @@ > > #include > > #include > > #include > > -#include > > +#include > > #include > > #include > > #include > > @@ -227,7 +227,9 @@ static void kvm_s390_cpu_feat_init(void) > > } > > > > if (test_facility(28)) /* TOD-clock steering */ > > - etr_ptff(kvm_s390_available_subfunc.ptff, ETR_PTFF_QAF); > > + ptff(kvm_s390_available_subfunc.ptff, > > + sizeof(kvm_s390_available_subfunc.ptff), > > + PTFF_QAF); > > > > if (test_facility(17)) { /* MSA */ > > __cpacf_query(CPACF_KMAC, kvm_s390_available_subfunc.kmac); > > >