From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161474AbcFHFRq (ORCPT ); Wed, 8 Jun 2016 01:17:46 -0400 Received: from e33.co.us.ibm.com ([32.97.110.151]:55846 "EHLO e33.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751696AbcFHFRo (ORCPT ); Wed, 8 Jun 2016 01:17:44 -0400 X-IBM-Helo: d03dlp03.boulder.ibm.com X-IBM-MailFrom: borntraeger@de.ibm.com X-IBM-RcptTo: sudipm.mukherjee@gmail.com;pbonzini@redhat.com;rkrcmar@redhat.com;kvm@vger.kernel.org;linux-kernel@vger.kernel.org;linux-s390@vger.kernel.org Subject: Re: [PATCH] KVM: s390: fix build failure To: Sudip Mukherjee , Cornelia Huck , Paolo Bonzini , =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= , Martin Schwidefsky , Heiko Carstens References: <1465336170-23064-1-git-send-email-sudipm.mukherjee@gmail.com> Cc: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, kvm@vger.kernel.org From: Christian Borntraeger Message-ID: <5757AA6F.705@de.ibm.com> Date: Wed, 8 Jun 2016 07:17:35 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.8.0 MIME-Version: 1.0 In-Reply-To: <1465336170-23064-1-git-send-email-sudipm.mukherjee@gmail.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16060805-0009-0000-0000-0000382A3B58 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. > --- > > 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); >