From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1756047AbcFHGjm (ORCPT <rfc822;w@1wt.eu>);
	Wed, 8 Jun 2016 02:39:42 -0400
Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:18585 "EHLO
	mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1754379AbcFHGjj (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Wed, 8 Jun 2016 02:39:39 -0400
X-IBM-Helo: d06dlp01.portsmouth.uk.ibm.com
X-IBM-MailFrom: schwidefsky@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 08:39:29 +0200
From: Martin Schwidefsky <schwidefsky@de.ibm.com>
To: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>,
        Cornelia Huck <cornelia.huck@de.ibm.com>,
        Paolo Bonzini <pbonzini@redhat.com>,
        Radim =?UTF-8?B?S3LEjW3DocWZ?= <rkrcmar@redhat.com>,
        Heiko Carstens <heiko.carstens@de.ibm.com>,
        linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org,
        kvm@vger.kernel.org
Subject: Re: [PATCH] KVM: s390: fix build failure
In-Reply-To: <1465336170-23064-1-git-send-email-sudipm.mukherjee@gmail.com>
References: <1465336170-23064-1-git-send-email-sudipm.mukherjee@gmail.com>
X-Mailer: Claws Mail 3.9.3 (GTK+ 2.24.23; x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-TM-AS-MML: disable
X-Content-Scanned: Fidelis XPS MAILER
x-cbid: 16060806-0028-0000-0000-000001D2E2FC
X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused
x-cbparentid: 16060806-0029-0000-0000-00001F221C22
Message-Id: <20160608083929.7268ddf5@mschwide>
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-1606080078
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Tue,  7 Jun 2016 22:49:30 +0100
Sudip Mukherjee <sudipm.mukherjee@gmail.com> 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 <sudip.mukherjee@codethink.co.uk>
> ---
> 
> 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 <linux/bitmap.h>
>  #include <asm/asm-offsets.h>
>  #include <asm/lowcore.h>
> -#include <asm/etr.h>
> +#include <asm/timex.h>
>  #include <asm/pgtable.h>
>  #include <asm/gmap.h>
>  #include <asm/nmi.h>
> @@ -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);

Already send the exact same patch to Stephen yesterday. But thanks anyway.

-- 
blue skies,
   Martin.

"Reality continues to ruin my life." - Calvin.