linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] KVM: s390: fix build failure
@ 2016-06-07 21:49 Sudip Mukherjee
  2016-06-08  5:17 ` Christian Borntraeger
  2016-06-08  6:39 ` Martin Schwidefsky
  0 siblings, 2 replies; 6+ messages in thread
From: Sudip Mukherjee @ 2016-06-07 21:49 UTC (permalink / raw)
  To: Christian Borntraeger, Cornelia Huck, Paolo Bonzini,
	Radim Krčmář,
	Martin Schwidefsky, Heiko Carstens
  Cc: linux-kernel, linux-s390, kvm, Sudip Mukherjee

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] KVM: s390: fix build failure
  2016-06-07 21:49 [PATCH] KVM: s390: fix build failure Sudip Mukherjee
@ 2016-06-08  5:17 ` Christian Borntraeger
  2016-06-08  5:31   ` Heiko Carstens
  2016-06-08  6:39 ` Martin Schwidefsky
  1 sibling, 1 reply; 6+ messages in thread
From: Christian Borntraeger @ 2016-06-08  5:17 UTC (permalink / raw)
  To: Sudip Mukherjee, Cornelia Huck, Paolo Bonzini,
	Radim Krčmář,
	Martin Schwidefsky, Heiko Carstens
  Cc: linux-kernel, linux-s390, kvm

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] KVM: s390: fix build failure
  2016-06-08  5:17 ` Christian Borntraeger
@ 2016-06-08  5:31   ` Heiko Carstens
  2016-06-08  8:09     ` Stephen Rothwell
  0 siblings, 1 reply; 6+ messages in thread
From: Heiko Carstens @ 2016-06-08  5:31 UTC (permalink / raw)
  To: Christian Borntraeger, Stephen Rothwell
  Cc: Sudip Mukherjee, Cornelia Huck, Paolo Bonzini,
	Radim Krčmář,
	Martin Schwidefsky, linux-kernel, linux-s390, kvm

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 <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.

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] KVM: s390: fix build failure
  2016-06-07 21:49 [PATCH] KVM: s390: fix build failure Sudip Mukherjee
  2016-06-08  5:17 ` Christian Borntraeger
@ 2016-06-08  6:39 ` Martin Schwidefsky
  1 sibling, 0 replies; 6+ messages in thread
From: Martin Schwidefsky @ 2016-06-08  6:39 UTC (permalink / raw)
  To: Sudip Mukherjee
  Cc: Christian Borntraeger, Cornelia Huck, Paolo Bonzini,
	Radim Krčmář,
	Heiko Carstens, linux-kernel, linux-s390, kvm

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.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] KVM: s390: fix build failure
  2016-06-08  5:31   ` Heiko Carstens
@ 2016-06-08  8:09     ` Stephen Rothwell
  2016-06-08 10:25       ` Paolo Bonzini
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2016-06-08  8:09 UTC (permalink / raw)
  To: Heiko Carstens
  Cc: Christian Borntraeger, Sudip Mukherjee, Cornelia Huck,
	Paolo Bonzini, Radim Krčmář,
	Martin Schwidefsky, linux-kernel, linux-s390, kvm

Hi Heiko,

On Wed, 8 Jun 2016 07:31:29 +0200 Heiko Carstens <heiko.carstens@de.ibm.com> wrote:
>
> 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 <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.  
> 
> We could ask Stephen Rothwell to apply the patch only to linux-next? ;)

Martin sent me the same patch earlier and I applied it to the merge of
the kvms390 tree today.  Someone needs to remember to tell Linus when
the time comes.

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] KVM: s390: fix build failure
  2016-06-08  8:09     ` Stephen Rothwell
@ 2016-06-08 10:25       ` Paolo Bonzini
  0 siblings, 0 replies; 6+ messages in thread
From: Paolo Bonzini @ 2016-06-08 10:25 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Heiko Carstens, Christian Borntraeger, Sudip Mukherjee,
	Cornelia Huck, Radim Krčmář,
	Martin Schwidefsky, linux-kernel, linux-s390, kvm



----- Original Message -----
> From: "Stephen Rothwell" <sfr@canb.auug.org.au>
> To: "Heiko Carstens" <heiko.carstens@de.ibm.com>
> Cc: "Christian Borntraeger" <borntraeger@de.ibm.com>, "Sudip Mukherjee" <sudipm.mukherjee@gmail.com>, "Cornelia Huck"
> <cornelia.huck@de.ibm.com>, "Paolo Bonzini" <pbonzini@redhat.com>, "Radim Krčmář" <rkrcmar@redhat.com>, "Martin
> Schwidefsky" <schwidefsky@de.ibm.com>, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, kvm@vger.kernel.org
> Sent: Wednesday, June 8, 2016 10:09:17 AM
> Subject: Re: [PATCH] KVM: s390: fix build failure
> 
> Hi Heiko,
> 
> On Wed, 8 Jun 2016 07:31:29 +0200 Heiko Carstens <heiko.carstens@de.ibm.com>
> wrote:
> >
> > 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 <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.
> > 
> > We could ask Stephen Rothwell to apply the patch only to linux-next? ;)
> 
> Martin sent me the same patch earlier and I applied it to the merge of
> the kvms390 tree today.  Someone needs to remember to tell Linus when
> the time comes.

I can take care of that.  On your side, the resolution will have to migrate
to the KVM tree as soon as Christian sends me a pull request for 4.8.

Thanks,

Paolo

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2016-06-08 10:25 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-07 21:49 [PATCH] KVM: s390: fix build failure Sudip Mukherjee
2016-06-08  5:17 ` Christian Borntraeger
2016-06-08  5:31   ` Heiko Carstens
2016-06-08  8:09     ` Stephen Rothwell
2016-06-08 10:25       ` Paolo Bonzini
2016-06-08  6:39 ` Martin Schwidefsky

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).