From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161654AbcFHFbo (ORCPT ); Wed, 8 Jun 2016 01:31:44 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:56726 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161626AbcFHFbm (ORCPT ); Wed, 8 Jun 2016 01:31:42 -0400 X-IBM-Helo: d06dlp02.portsmouth.uk.ibm.com X-IBM-MailFrom: heiko.carstens@de.ibm.com X-IBM-RcptTo: kvm@vger.kernel.org;linux-kernel@vger.kernel.org;linux-s390@vger.kernel.org Date: Wed, 8 Jun 2016 07:31:29 +0200 From: Heiko Carstens To: Christian Borntraeger , Stephen Rothwell 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 Subject: Re: [PATCH] KVM: s390: fix build failure 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 Content-Disposition: inline In-Reply-To: <5757AA6F.705@de.ibm.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16060805-0032-0000-0000-000001D45F11 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16060805-0033-0000-0000-00001B23D455 Message-Id: <20160608053129.GA3311@osiris> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-06-08_01:,, 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-1604210000 definitions=main-1606080066 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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); > > >