Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1416870

Re: [PATCH] KVM: s390: fix build failure

Show all headers | View raw

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 <sudip.mukherjee@codethink.co.uk>

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 <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);
> 

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH] KVM: s390: fix build failure Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2016-06-07 23:50 +0200
  Re: [PATCH] KVM: s390: fix build failure Christian Borntraeger <borntraeger@de.ibm.com> - 2016-06-08 07:20 +0200
    Re: [PATCH] KVM: s390: fix build failure Heiko Carstens <heiko.carstens@de.ibm.com> - 2016-06-08 07:40 +0200
      Re: [PATCH] KVM: s390: fix build failure Stephen Rothwell <sfr@canb.auug.org.au> - 2016-06-08 10:20 +0200
        Re: [PATCH] KVM: s390: fix build failure Paolo Bonzini <pbonzini@redhat.com> - 2016-06-08 12:30 +0200
  Re: [PATCH] KVM: s390: fix build failure Martin Schwidefsky <schwidefsky@de.ibm.com> - 2016-06-08 08:40 +0200

csiph-web