[GIT PULL] KVM/ARM Fixes for 3.12-rc2

[GIT PULL] KVM/ARM Fixes for 3.12-rc2

[Christoffer Dall]

The following changes since commit 62d228b8c676232eca579f91cc0782b060a59097:

  Merge branch 'fixes' of git://git.kernel.org/pub/scm/virt/kvm/kvm (2013-09-17 22:20:30 -0400)

are available in the git repository at:


  git://git.linaro.org/people/cdall/linux-kvm-arm.git tags/kvm-arm-fixes-3.12-rc2

for you to fetch changes up to ac570e0493815e0b41681c89cb50d66421429d27:

  ARM: kvm: rename cpu_reset to avoid name clash (2013-09-24 11:15:05 -0700)

----------------------------------------------------------------
KVM/ARM Fixes for 3.12-rc2

Fixes compilation error with KVM/ARM enabled.

----------------------------------------------------------------
Olof Johansson (1):
      ARM: kvm: rename cpu_reset to avoid name clash

 arch/arm/kvm/reset.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

-- 
1.7.10.4

[GIT PULL] KVM/ARM Fixes for 3.12-rc2

[Christoffer Dall]

The following changes since commit 62d228b8c676232eca579f91cc0782b060a59097:

  Merge branch 'fixes' of git://git.kernel.org/pub/scm/virt/kvm/kvm (2013-09-17 22:20:30 -0400)

are available in the git repository at:


  git://git.linaro.org/people/cdall/linux-kvm-arm.git tags/kvm-arm-fixes-3.12-rc2

for you to fetch changes up to ac570e0493815e0b41681c89cb50d66421429d27:

  ARM: kvm: rename cpu_reset to avoid name clash (2013-09-24 11:15:05 -0700)

----------------------------------------------------------------
KVM/ARM Fixes for 3.12-rc2

Fixes compilation error with KVM/ARM enabled.

----------------------------------------------------------------
Olof Johansson (1):
      ARM: kvm: rename cpu_reset to avoid name clash

 arch/arm/kvm/reset.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

-- 
1.7.10.4

[PATCH] ARM: kvm: rename cpu_reset to avoid name clash

[Christoffer Dall]

From: Olof Johansson <olof@lixom.net>

cpu_reset is already #defined in <asm/proc-fns.h> as processor.reset,
so it expands here and causes problems.

Cc: <stable@vger.kernel.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
---
 arch/arm/kvm/reset.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/kvm/reset.c b/arch/arm/kvm/reset.c
index 71e08ba..c02ba4a 100644
--- a/arch/arm/kvm/reset.c
+++ b/arch/arm/kvm/reset.c
@@ -58,14 +58,14 @@ static const struct kvm_irq_level a15_vtimer_irq = {
  */
 int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
 {
-	struct kvm_regs *cpu_reset;
+	struct kvm_regs *reset_regs;
 	const struct kvm_irq_level *cpu_vtimer_irq;
 
 	switch (vcpu->arch.target) {
 	case KVM_ARM_TARGET_CORTEX_A15:
 		if (vcpu->vcpu_id > a15_max_cpu_idx)
 			return -EINVAL;
-		cpu_reset = &a15_regs_reset;
+		reset_regs = &a15_regs_reset;
 		vcpu->arch.midr = read_cpuid_id();
 		cpu_vtimer_irq = &a15_vtimer_irq;
 		break;
@@ -74,7 +74,7 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
 	}
 
 	/* Reset core registers */
-	memcpy(&vcpu->arch.regs, cpu_reset, sizeof(vcpu->arch.regs));
+	memcpy(&vcpu->arch.regs, reset_regs, sizeof(vcpu->arch.regs));
 
 	/* Reset CP15 registers */
 	kvm_reset_coprocs(vcpu);
-- 
1.7.10.4

[PATCH] ARM: kvm: rename cpu_reset to avoid name clash

[Christoffer Dall]

From: Olof Johansson <olof@lixom.net>

cpu_reset is already #defined in <asm/proc-fns.h> as processor.reset,
so it expands here and causes problems.

Cc: <stable@vger.kernel.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
---
 arch/arm/kvm/reset.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/kvm/reset.c b/arch/arm/kvm/reset.c
index 71e08ba..c02ba4a 100644
--- a/arch/arm/kvm/reset.c
+++ b/arch/arm/kvm/reset.c
@@ -58,14 +58,14 @@ static const struct kvm_irq_level a15_vtimer_irq = {
  */
 int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
 {
-	struct kvm_regs *cpu_reset;
+	struct kvm_regs *reset_regs;
 	const struct kvm_irq_level *cpu_vtimer_irq;
 
 	switch (vcpu->arch.target) {
 	case KVM_ARM_TARGET_CORTEX_A15:
 		if (vcpu->vcpu_id > a15_max_cpu_idx)
 			return -EINVAL;
-		cpu_reset = &a15_regs_reset;
+		reset_regs = &a15_regs_reset;
 		vcpu->arch.midr = read_cpuid_id();
 		cpu_vtimer_irq = &a15_vtimer_irq;
 		break;
@@ -74,7 +74,7 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
 	}
 
 	/* Reset core registers */
-	memcpy(&vcpu->arch.regs, cpu_reset, sizeof(vcpu->arch.regs));
+	memcpy(&vcpu->arch.regs, reset_regs, sizeof(vcpu->arch.regs));
 
 	/* Reset CP15 registers */
 	kvm_reset_coprocs(vcpu);
-- 
1.7.10.4

Re: [GIT PULL] KVM/ARM Fixes for 3.12-rc2

[Paolo Bonzini]

Il 24/09/2013 21:49, Christoffer Dall ha scritto:
> The following changes since commit 62d228b8c676232eca579f91cc0782b060a59097:
> 
>   Merge branch 'fixes' of git://git.kernel.org/pub/scm/virt/kvm/kvm (2013-09-17 22:20:30 -0400)
> 
> are available in the git repository at:
> 
> 
>   git://git.linaro.org/people/cdall/linux-kvm-arm.git tags/kvm-arm-fixes-3.12-rc2
> 
> for you to fetch changes up to ac570e0493815e0b41681c89cb50d66421429d27:
> 
>   ARM: kvm: rename cpu_reset to avoid name clash (2013-09-24 11:15:05 -0700)
> 
> ----------------------------------------------------------------
> KVM/ARM Fixes for 3.12-rc2
> 
> Fixes compilation error with KVM/ARM enabled.
> 
> ----------------------------------------------------------------
> Olof Johansson (1):
>       ARM: kvm: rename cpu_reset to avoid name clash
> 
>  arch/arm/kvm/reset.c |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 

Pulled, thanks.

Paolo

[GIT PULL] KVM/ARM Fixes for 3.12-rc2

[Paolo Bonzini]

Il 24/09/2013 21:49, Christoffer Dall ha scritto:
> The following changes since commit 62d228b8c676232eca579f91cc0782b060a59097:
> 
>   Merge branch 'fixes' of git://git.kernel.org/pub/scm/virt/kvm/kvm (2013-09-17 22:20:30 -0400)
> 
> are available in the git repository at:
> 
> 
>   git://git.linaro.org/people/cdall/linux-kvm-arm.git tags/kvm-arm-fixes-3.12-rc2
> 
> for you to fetch changes up to ac570e0493815e0b41681c89cb50d66421429d27:
> 
>   ARM: kvm: rename cpu_reset to avoid name clash (2013-09-24 11:15:05 -0700)
> 
> ----------------------------------------------------------------
> KVM/ARM Fixes for 3.12-rc2
> 
> Fixes compilation error with KVM/ARM enabled.
> 
> ----------------------------------------------------------------
> Olof Johansson (1):
>       ARM: kvm: rename cpu_reset to avoid name clash
> 
>  arch/arm/kvm/reset.c |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 

Pulled, thanks.

Paolo

Re: [GIT PULL] KVM/ARM Fixes for 3.12-rc2

[Olof Johansson]

Paolo,

On Wed, Sep 25, 2013 at 2:49 AM, Paolo Bonzini <pbonzini@redhat.com> wrote:
> Il 24/09/2013 21:49, Christoffer Dall ha scritto:
>> The following changes since commit 62d228b8c676232eca579f91cc0782b060a59097:
>>
>>   Merge branch 'fixes' of git://git.kernel.org/pub/scm/virt/kvm/kvm (2013-09-17 22:20:30 -0400)
>>
>> are available in the git repository at:
>>
>>
>>   git://git.linaro.org/people/cdall/linux-kvm-arm.git tags/kvm-arm-fixes-3.12-rc2
>>
>> for you to fetch changes up to ac570e0493815e0b41681c89cb50d66421429d27:
>>
>>   ARM: kvm: rename cpu_reset to avoid name clash (2013-09-24 11:15:05 -0700)
>>
>> ----------------------------------------------------------------
>> KVM/ARM Fixes for 3.12-rc2
>>
>> Fixes compilation error with KVM/ARM enabled.
>>
>> ----------------------------------------------------------------
>> Olof Johansson (1):
>>       ARM: kvm: rename cpu_reset to avoid name clash
>>
>>  arch/arm/kvm/reset.c |    6 +++---
>>  1 file changed, 3 insertions(+), 3 deletions(-)
>>
>
> Pulled, thanks.

When do you expect to send your branch to Linus? I haven't seen it
land there yet, nor in linux-next. This is keeping us from even
building KVM-enabled kernels on ARM.



-Olof

[GIT PULL] KVM/ARM Fixes for 3.12-rc2

[Olof Johansson]

Paolo,

On Wed, Sep 25, 2013 at 2:49 AM, Paolo Bonzini <pbonzini@redhat.com> wrote:
> Il 24/09/2013 21:49, Christoffer Dall ha scritto:
>> The following changes since commit 62d228b8c676232eca579f91cc0782b060a59097:
>>
>>   Merge branch 'fixes' of git://git.kernel.org/pub/scm/virt/kvm/kvm (2013-09-17 22:20:30 -0400)
>>
>> are available in the git repository at:
>>
>>
>>   git://git.linaro.org/people/cdall/linux-kvm-arm.git tags/kvm-arm-fixes-3.12-rc2
>>
>> for you to fetch changes up to ac570e0493815e0b41681c89cb50d66421429d27:
>>
>>   ARM: kvm: rename cpu_reset to avoid name clash (2013-09-24 11:15:05 -0700)
>>
>> ----------------------------------------------------------------
>> KVM/ARM Fixes for 3.12-rc2
>>
>> Fixes compilation error with KVM/ARM enabled.
>>
>> ----------------------------------------------------------------
>> Olof Johansson (1):
>>       ARM: kvm: rename cpu_reset to avoid name clash
>>
>>  arch/arm/kvm/reset.c |    6 +++---
>>  1 file changed, 3 insertions(+), 3 deletions(-)
>>
>
> Pulled, thanks.

When do you expect to send your branch to Linus? I haven't seen it
land there yet, nor in linux-next. This is keeping us from even
building KVM-enabled kernels on ARM.



-Olof

Re: [GIT PULL] KVM/ARM Fixes for 3.12-rc2

[Gleb Natapov]

On Wed, Oct 02, 2013 at 01:14:57PM -0700, Olof Johansson wrote:
> Paolo,
> 
> On Wed, Sep 25, 2013 at 2:49 AM, Paolo Bonzini <pbonzini@redhat.com> wrote:
> > Il 24/09/2013 21:49, Christoffer Dall ha scritto:
> >> The following changes since commit 62d228b8c676232eca579f91cc0782b060a59097:
> >>
> >>   Merge branch 'fixes' of git://git.kernel.org/pub/scm/virt/kvm/kvm (2013-09-17 22:20:30 -0400)
> >>
> >> are available in the git repository at:
> >>
> >>
> >>   git://git.linaro.org/people/cdall/linux-kvm-arm.git tags/kvm-arm-fixes-3.12-rc2
> >>
> >> for you to fetch changes up to ac570e0493815e0b41681c89cb50d66421429d27:
> >>
> >>   ARM: kvm: rename cpu_reset to avoid name clash (2013-09-24 11:15:05 -0700)
> >>
> >> ----------------------------------------------------------------
> >> KVM/ARM Fixes for 3.12-rc2
> >>
> >> Fixes compilation error with KVM/ARM enabled.
> >>
> >> ----------------------------------------------------------------
> >> Olof Johansson (1):
> >>       ARM: kvm: rename cpu_reset to avoid name clash
> >>
> >>  arch/arm/kvm/reset.c |    6 +++---
> >>  1 file changed, 3 insertions(+), 3 deletions(-)
> >>
> >
> > Pulled, thanks.
> 
> When do you expect to send your branch to Linus? I haven't seen it
> land there yet, nor in linux-next. This is keeping us from even
> building KVM-enabled kernels on ARM.
> 
It is in Linus tree for a couple of days now.

--
			Gleb.

[GIT PULL] KVM/ARM Fixes for 3.12-rc2

[Gleb Natapov]

On Wed, Oct 02, 2013 at 01:14:57PM -0700, Olof Johansson wrote:
> Paolo,
> 
> On Wed, Sep 25, 2013 at 2:49 AM, Paolo Bonzini <pbonzini@redhat.com> wrote:
> > Il 24/09/2013 21:49, Christoffer Dall ha scritto:
> >> The following changes since commit 62d228b8c676232eca579f91cc0782b060a59097:
> >>
> >>   Merge branch 'fixes' of git://git.kernel.org/pub/scm/virt/kvm/kvm (2013-09-17 22:20:30 -0400)
> >>
> >> are available in the git repository at:
> >>
> >>
> >>   git://git.linaro.org/people/cdall/linux-kvm-arm.git tags/kvm-arm-fixes-3.12-rc2
> >>
> >> for you to fetch changes up to ac570e0493815e0b41681c89cb50d66421429d27:
> >>
> >>   ARM: kvm: rename cpu_reset to avoid name clash (2013-09-24 11:15:05 -0700)
> >>
> >> ----------------------------------------------------------------
> >> KVM/ARM Fixes for 3.12-rc2
> >>
> >> Fixes compilation error with KVM/ARM enabled.
> >>
> >> ----------------------------------------------------------------
> >> Olof Johansson (1):
> >>       ARM: kvm: rename cpu_reset to avoid name clash
> >>
> >>  arch/arm/kvm/reset.c |    6 +++---
> >>  1 file changed, 3 insertions(+), 3 deletions(-)
> >>
> >
> > Pulled, thanks.
> 
> When do you expect to send your branch to Linus? I haven't seen it
> land there yet, nor in linux-next. This is keeping us from even
> building KVM-enabled kernels on ARM.
> 
It is in Linus tree for a couple of days now.

--
			Gleb.

Re: [GIT PULL] KVM/ARM Fixes for 3.12-rc2

[Olof Johansson]

On Wed, Oct 2, 2013 at 9:04 PM, Gleb Natapov <gleb@redhat.com> wrote:
> On Wed, Oct 02, 2013 at 01:14:57PM -0700, Olof Johansson wrote:
>> Paolo,
>>
>> On Wed, Sep 25, 2013 at 2:49 AM, Paolo Bonzini <pbonzini@redhat.com> wrote:
>> > Il 24/09/2013 21:49, Christoffer Dall ha scritto:
>> >> The following changes since commit 62d228b8c676232eca579f91cc0782b060a59097:
>> >>
>> >>   Merge branch 'fixes' of git://git.kernel.org/pub/scm/virt/kvm/kvm (2013-09-17 22:20:30 -0400)
>> >>
>> >> are available in the git repository at:
>> >>
>> >>
>> >>   git://git.linaro.org/people/cdall/linux-kvm-arm.git tags/kvm-arm-fixes-3.12-rc2
>> >>
>> >> for you to fetch changes up to ac570e0493815e0b41681c89cb50d66421429d27:
>> >>
>> >>   ARM: kvm: rename cpu_reset to avoid name clash (2013-09-24 11:15:05 -0700)
>> >>
>> >> ----------------------------------------------------------------
>> >> KVM/ARM Fixes for 3.12-rc2
>> >>
>> >> Fixes compilation error with KVM/ARM enabled.
>> >>
>> >> ----------------------------------------------------------------
>> >> Olof Johansson (1):
>> >>       ARM: kvm: rename cpu_reset to avoid name clash
>> >>
>> >>  arch/arm/kvm/reset.c |    6 +++---
>> >>  1 file changed, 3 insertions(+), 3 deletions(-)
>> >>
>> >
>> > Pulled, thanks.
>>
>> When do you expect to send your branch to Linus? I haven't seen it
>> land there yet, nor in linux-next. This is keeping us from even
>> building KVM-enabled kernels on ARM.
>>
> It is in Linus tree for a couple of days now.

Weird, I looked at both mainline and -next this morning, or so I
thought. Thanks, and apologies for the noise.


-Olof

[GIT PULL] KVM/ARM Fixes for 3.12-rc2

[Olof Johansson]

On Wed, Oct 2, 2013 at 9:04 PM, Gleb Natapov <gleb@redhat.com> wrote:
> On Wed, Oct 02, 2013 at 01:14:57PM -0700, Olof Johansson wrote:
>> Paolo,
>>
>> On Wed, Sep 25, 2013 at 2:49 AM, Paolo Bonzini <pbonzini@redhat.com> wrote:
>> > Il 24/09/2013 21:49, Christoffer Dall ha scritto:
>> >> The following changes since commit 62d228b8c676232eca579f91cc0782b060a59097:
>> >>
>> >>   Merge branch 'fixes' of git://git.kernel.org/pub/scm/virt/kvm/kvm (2013-09-17 22:20:30 -0400)
>> >>
>> >> are available in the git repository at:
>> >>
>> >>
>> >>   git://git.linaro.org/people/cdall/linux-kvm-arm.git tags/kvm-arm-fixes-3.12-rc2
>> >>
>> >> for you to fetch changes up to ac570e0493815e0b41681c89cb50d66421429d27:
>> >>
>> >>   ARM: kvm: rename cpu_reset to avoid name clash (2013-09-24 11:15:05 -0700)
>> >>
>> >> ----------------------------------------------------------------
>> >> KVM/ARM Fixes for 3.12-rc2
>> >>
>> >> Fixes compilation error with KVM/ARM enabled.
>> >>
>> >> ----------------------------------------------------------------
>> >> Olof Johansson (1):
>> >>       ARM: kvm: rename cpu_reset to avoid name clash
>> >>
>> >>  arch/arm/kvm/reset.c |    6 +++---
>> >>  1 file changed, 3 insertions(+), 3 deletions(-)
>> >>
>> >
>> > Pulled, thanks.
>>
>> When do you expect to send your branch to Linus? I haven't seen it
>> land there yet, nor in linux-next. This is keeping us from even
>> building KVM-enabled kernels on ARM.
>>
> It is in Linus tree for a couple of days now.

Weird, I looked at both mainline and -next this morning, or so I
thought. Thanks, and apologies for the noise.


-Olof

Re: [PATCH] ARM: kvm: rename cpu_reset to avoid name clash

[Christoffer Dall]

On Mon, Sep 23, 2013 at 09:30:42PM +0100, Russell King - ARM Linux wrote:
> On Mon, Sep 23, 2013 at 12:59:44PM -0700, Olof Johansson wrote:
> > Hi Christoffer,
> > 
> > On Mon, Sep 16, 2013 at 8:47 PM, Christoffer Dall
> > <christoffer.dall@linaro.org> wrote:
> > > On 16 September 2013 19:41, Olof Johansson <olof@lixom.net> wrote:
> > >> Hi,
> > >>
> > >> On Wed, Sep 11, 2013 at 6:50 PM, Christoffer Dall
> > >> <christoffer.dall@linaro.org> wrote:
> > >>> On Wed, Sep 11, 2013 at 03:39:26PM -0700, Olof Johansson wrote:
> > >>>> On Wed, Sep 11, 2013 at 3:27 PM, Olof Johansson <olof@lixom.net> wrote:
> > >>>> > cpu_reset is already #defined in <asm/proc-fns.h> as processor.reset,
> > >>>> > so it expands here and causes problems.
> > >>>> >
> > >>>> > Signed-off-by: Olof Johansson <olof@lixom.net>
> > >>>>
> > >>>> I just noticed this is broken on 3.10 too, so if/when applying feel free to add:
> > >>>>
> > >>>> Cc: <stable@vger.kernel.org> # 3.10+
> > >>>>
> > >>> Thanks for the fix, applied.
> > >>
> > >> I haven't seen this hit linux-next yet?
> > >>
> > > I was waiting for kvm/next to move to 3.12-rc1 and base the patch for
> > > kvm-arm-next off there, but I pushed this to kvm-arm-next now and it
> > > should land in linux-next as soon as they update.
> > 
> > Another week has passed, and -next and mainline are both still broken.
> > Can we please see a fix in mainline and -next within the next few
> > days?
> 
> I'm getting failing builds too, which will only stop once it hits
> mainline.

Apologies about this, apparently linux-next doesn't pull in my tree despite
e-mail confirmation that it did.  I was away last week for LPC, but I'll
make sure this lands upstream ASAP.

-Christoffer

[PATCH] ARM: kvm: rename cpu_reset to avoid name clash

[Christoffer Dall]

On Mon, Sep 23, 2013 at 09:30:42PM +0100, Russell King - ARM Linux wrote:
> On Mon, Sep 23, 2013 at 12:59:44PM -0700, Olof Johansson wrote:
> > Hi Christoffer,
> > 
> > On Mon, Sep 16, 2013 at 8:47 PM, Christoffer Dall
> > <christoffer.dall@linaro.org> wrote:
> > > On 16 September 2013 19:41, Olof Johansson <olof@lixom.net> wrote:
> > >> Hi,
> > >>
> > >> On Wed, Sep 11, 2013 at 6:50 PM, Christoffer Dall
> > >> <christoffer.dall@linaro.org> wrote:
> > >>> On Wed, Sep 11, 2013 at 03:39:26PM -0700, Olof Johansson wrote:
> > >>>> On Wed, Sep 11, 2013 at 3:27 PM, Olof Johansson <olof@lixom.net> wrote:
> > >>>> > cpu_reset is already #defined in <asm/proc-fns.h> as processor.reset,
> > >>>> > so it expands here and causes problems.
> > >>>> >
> > >>>> > Signed-off-by: Olof Johansson <olof@lixom.net>
> > >>>>
> > >>>> I just noticed this is broken on 3.10 too, so if/when applying feel free to add:
> > >>>>
> > >>>> Cc: <stable@vger.kernel.org> # 3.10+
> > >>>>
> > >>> Thanks for the fix, applied.
> > >>
> > >> I haven't seen this hit linux-next yet?
> > >>
> > > I was waiting for kvm/next to move to 3.12-rc1 and base the patch for
> > > kvm-arm-next off there, but I pushed this to kvm-arm-next now and it
> > > should land in linux-next as soon as they update.
> > 
> > Another week has passed, and -next and mainline are both still broken.
> > Can we please see a fix in mainline and -next within the next few
> > days?
> 
> I'm getting failing builds too, which will only stop once it hits
> mainline.

Apologies about this, apparently linux-next doesn't pull in my tree despite
e-mail confirmation that it did.  I was away last week for LPC, but I'll
make sure this lands upstream ASAP.

-Christoffer

Re: [PATCH] ARM: kvm: rename cpu_reset to avoid name clash

[Russell King - ARM Linux]

On Mon, Sep 23, 2013 at 12:59:44PM -0700, Olof Johansson wrote:
> Hi Christoffer,
> 
> On Mon, Sep 16, 2013 at 8:47 PM, Christoffer Dall
> <christoffer.dall@linaro.org> wrote:
> > On 16 September 2013 19:41, Olof Johansson <olof@lixom.net> wrote:
> >> Hi,
> >>
> >> On Wed, Sep 11, 2013 at 6:50 PM, Christoffer Dall
> >> <christoffer.dall@linaro.org> wrote:
> >>> On Wed, Sep 11, 2013 at 03:39:26PM -0700, Olof Johansson wrote:
> >>>> On Wed, Sep 11, 2013 at 3:27 PM, Olof Johansson <olof@lixom.net> wrote:
> >>>> > cpu_reset is already #defined in <asm/proc-fns.h> as processor.reset,
> >>>> > so it expands here and causes problems.
> >>>> >
> >>>> > Signed-off-by: Olof Johansson <olof@lixom.net>
> >>>>
> >>>> I just noticed this is broken on 3.10 too, so if/when applying feel free to add:
> >>>>
> >>>> Cc: <stable@vger.kernel.org> # 3.10+
> >>>>
> >>> Thanks for the fix, applied.
> >>
> >> I haven't seen this hit linux-next yet?
> >>
> > I was waiting for kvm/next to move to 3.12-rc1 and base the patch for
> > kvm-arm-next off there, but I pushed this to kvm-arm-next now and it
> > should land in linux-next as soon as they update.
> 
> Another week has passed, and -next and mainline are both still broken.
> Can we please see a fix in mainline and -next within the next few
> days?

I'm getting failing builds too, which will only stop once it hits
mainline.

[PATCH] ARM: kvm: rename cpu_reset to avoid name clash

[Russell King - ARM Linux]

On Mon, Sep 23, 2013 at 12:59:44PM -0700, Olof Johansson wrote:
> Hi Christoffer,
> 
> On Mon, Sep 16, 2013 at 8:47 PM, Christoffer Dall
> <christoffer.dall@linaro.org> wrote:
> > On 16 September 2013 19:41, Olof Johansson <olof@lixom.net> wrote:
> >> Hi,
> >>
> >> On Wed, Sep 11, 2013 at 6:50 PM, Christoffer Dall
> >> <christoffer.dall@linaro.org> wrote:
> >>> On Wed, Sep 11, 2013 at 03:39:26PM -0700, Olof Johansson wrote:
> >>>> On Wed, Sep 11, 2013 at 3:27 PM, Olof Johansson <olof@lixom.net> wrote:
> >>>> > cpu_reset is already #defined in <asm/proc-fns.h> as processor.reset,
> >>>> > so it expands here and causes problems.
> >>>> >
> >>>> > Signed-off-by: Olof Johansson <olof@lixom.net>
> >>>>
> >>>> I just noticed this is broken on 3.10 too, so if/when applying feel free to add:
> >>>>
> >>>> Cc: <stable@vger.kernel.org> # 3.10+
> >>>>
> >>> Thanks for the fix, applied.
> >>
> >> I haven't seen this hit linux-next yet?
> >>
> > I was waiting for kvm/next to move to 3.12-rc1 and base the patch for
> > kvm-arm-next off there, but I pushed this to kvm-arm-next now and it
> > should land in linux-next as soon as they update.
> 
> Another week has passed, and -next and mainline are both still broken.
> Can we please see a fix in mainline and -next within the next few
> days?

I'm getting failing builds too, which will only stop once it hits
mainline.

Re: [PATCH] ARM: kvm: rename cpu_reset to avoid name clash

[Olof Johansson]

Hi Christoffer,

On Mon, Sep 16, 2013 at 8:47 PM, Christoffer Dall
<christoffer.dall@linaro.org> wrote:
> On 16 September 2013 19:41, Olof Johansson <olof@lixom.net> wrote:
>> Hi,
>>
>> On Wed, Sep 11, 2013 at 6:50 PM, Christoffer Dall
>> <christoffer.dall@linaro.org> wrote:
>>> On Wed, Sep 11, 2013 at 03:39:26PM -0700, Olof Johansson wrote:
>>>> On Wed, Sep 11, 2013 at 3:27 PM, Olof Johansson <olof@lixom.net> wrote:
>>>> > cpu_reset is already #defined in <asm/proc-fns.h> as processor.reset,
>>>> > so it expands here and causes problems.
>>>> >
>>>> > Signed-off-by: Olof Johansson <olof@lixom.net>
>>>>
>>>> I just noticed this is broken on 3.10 too, so if/when applying feel free to add:
>>>>
>>>> Cc: <stable@vger.kernel.org> # 3.10+
>>>>
>>> Thanks for the fix, applied.
>>
>> I haven't seen this hit linux-next yet?
>>
> I was waiting for kvm/next to move to 3.12-rc1 and base the patch for
> kvm-arm-next off there, but I pushed this to kvm-arm-next now and it
> should land in linux-next as soon as they update.

Another week has passed, and -next and mainline are both still broken.
Can we please see a fix in mainline and -next within the next few
days?


-Olof

[PATCH] ARM: kvm: rename cpu_reset to avoid name clash

[Olof Johansson]

Hi Christoffer,

On Mon, Sep 16, 2013 at 8:47 PM, Christoffer Dall
<christoffer.dall@linaro.org> wrote:
> On 16 September 2013 19:41, Olof Johansson <olof@lixom.net> wrote:
>> Hi,
>>
>> On Wed, Sep 11, 2013 at 6:50 PM, Christoffer Dall
>> <christoffer.dall@linaro.org> wrote:
>>> On Wed, Sep 11, 2013 at 03:39:26PM -0700, Olof Johansson wrote:
>>>> On Wed, Sep 11, 2013 at 3:27 PM, Olof Johansson <olof@lixom.net> wrote:
>>>> > cpu_reset is already #defined in <asm/proc-fns.h> as processor.reset,
>>>> > so it expands here and causes problems.
>>>> >
>>>> > Signed-off-by: Olof Johansson <olof@lixom.net>
>>>>
>>>> I just noticed this is broken on 3.10 too, so if/when applying feel free to add:
>>>>
>>>> Cc: <stable@vger.kernel.org> # 3.10+
>>>>
>>> Thanks for the fix, applied.
>>
>> I haven't seen this hit linux-next yet?
>>
> I was waiting for kvm/next to move to 3.12-rc1 and base the patch for
> kvm-arm-next off there, but I pushed this to kvm-arm-next now and it
> should land in linux-next as soon as they update.

Another week has passed, and -next and mainline are both still broken.
Can we please see a fix in mainline and -next within the next few
days?


-Olof

Re: [PATCH] ARM: kvm: rename cpu_reset to avoid name clash

[Christoffer Dall]

On 16 September 2013 19:41, Olof Johansson <olof@lixom.net> wrote:
> Hi,
>
> On Wed, Sep 11, 2013 at 6:50 PM, Christoffer Dall
> <christoffer.dall@linaro.org> wrote:
>> On Wed, Sep 11, 2013 at 03:39:26PM -0700, Olof Johansson wrote:
>>> On Wed, Sep 11, 2013 at 3:27 PM, Olof Johansson <olof@lixom.net> wrote:
>>> > cpu_reset is already #defined in <asm/proc-fns.h> as processor.reset,
>>> > so it expands here and causes problems.
>>> >
>>> > Signed-off-by: Olof Johansson <olof@lixom.net>
>>>
>>> I just noticed this is broken on 3.10 too, so if/when applying feel free to add:
>>>
>>> Cc: <stable@vger.kernel.org> # 3.10+
>>>
>> Thanks for the fix, applied.
>
> I haven't seen this hit linux-next yet?
>
I was waiting for kvm/next to move to 3.12-rc1 and base the patch for
kvm-arm-next off there, but I pushed this to kvm-arm-next now and it
should land in linux-next as soon as they update.

-Christoffer

[PATCH] ARM: kvm: rename cpu_reset to avoid name clash

[Christoffer Dall]

On 16 September 2013 19:41, Olof Johansson <olof@lixom.net> wrote:
> Hi,
>
> On Wed, Sep 11, 2013 at 6:50 PM, Christoffer Dall
> <christoffer.dall@linaro.org> wrote:
>> On Wed, Sep 11, 2013 at 03:39:26PM -0700, Olof Johansson wrote:
>>> On Wed, Sep 11, 2013 at 3:27 PM, Olof Johansson <olof@lixom.net> wrote:
>>> > cpu_reset is already #defined in <asm/proc-fns.h> as processor.reset,
>>> > so it expands here and causes problems.
>>> >
>>> > Signed-off-by: Olof Johansson <olof@lixom.net>
>>>
>>> I just noticed this is broken on 3.10 too, so if/when applying feel free to add:
>>>
>>> Cc: <stable@vger.kernel.org> # 3.10+
>>>
>> Thanks for the fix, applied.
>
> I haven't seen this hit linux-next yet?
>
I was waiting for kvm/next to move to 3.12-rc1 and base the patch for
kvm-arm-next off there, but I pushed this to kvm-arm-next now and it
should land in linux-next as soon as they update.

-Christoffer

Re: [PATCH] ARM: kvm: rename cpu_reset to avoid name clash

[Olof Johansson]

Hi,

On Wed, Sep 11, 2013 at 6:50 PM, Christoffer Dall
<christoffer.dall@linaro.org> wrote:
> On Wed, Sep 11, 2013 at 03:39:26PM -0700, Olof Johansson wrote:
>> On Wed, Sep 11, 2013 at 3:27 PM, Olof Johansson <olof@lixom.net> wrote:
>> > cpu_reset is already #defined in <asm/proc-fns.h> as processor.reset,
>> > so it expands here and causes problems.
>> >
>> > Signed-off-by: Olof Johansson <olof@lixom.net>
>>
>> I just noticed this is broken on 3.10 too, so if/when applying feel free to add:
>>
>> Cc: <stable@vger.kernel.org> # 3.10+
>>
> Thanks for the fix, applied.

I haven't seen this hit linux-next yet?


-Olof

[PATCH] ARM: kvm: rename cpu_reset to avoid name clash

[Olof Johansson]

Hi,

On Wed, Sep 11, 2013 at 6:50 PM, Christoffer Dall
<christoffer.dall@linaro.org> wrote:
> On Wed, Sep 11, 2013 at 03:39:26PM -0700, Olof Johansson wrote:
>> On Wed, Sep 11, 2013 at 3:27 PM, Olof Johansson <olof@lixom.net> wrote:
>> > cpu_reset is already #defined in <asm/proc-fns.h> as processor.reset,
>> > so it expands here and causes problems.
>> >
>> > Signed-off-by: Olof Johansson <olof@lixom.net>
>>
>> I just noticed this is broken on 3.10 too, so if/when applying feel free to add:
>>
>> Cc: <stable@vger.kernel.org> # 3.10+
>>
> Thanks for the fix, applied.

I haven't seen this hit linux-next yet?


-Olof

Re: [PATCH] ARM: kvm: rename cpu_reset to avoid name clash

[Christoffer Dall]

On Wed, Sep 11, 2013 at 03:39:26PM -0700, Olof Johansson wrote:
> On Wed, Sep 11, 2013 at 3:27 PM, Olof Johansson <olof@lixom.net> wrote:
> > cpu_reset is already #defined in <asm/proc-fns.h> as processor.reset,
> > so it expands here and causes problems.
> >
> > Signed-off-by: Olof Johansson <olof@lixom.net>
> 
> I just noticed this is broken on 3.10 too, so if/when applying feel free to add:
> 
> Cc: <stable@vger.kernel.org> # 3.10+
> 
Thanks for the fix, applied.

-Christoffer

[PATCH] ARM: kvm: rename cpu_reset to avoid name clash

[Christoffer Dall]

On Wed, Sep 11, 2013 at 03:39:26PM -0700, Olof Johansson wrote:
> On Wed, Sep 11, 2013 at 3:27 PM, Olof Johansson <olof@lixom.net> wrote:
> > cpu_reset is already #defined in <asm/proc-fns.h> as processor.reset,
> > so it expands here and causes problems.
> >
> > Signed-off-by: Olof Johansson <olof@lixom.net>
> 
> I just noticed this is broken on 3.10 too, so if/when applying feel free to add:
> 
> Cc: <stable@vger.kernel.org> # 3.10+
> 
Thanks for the fix, applied.

-Christoffer

Re: [PATCH] ARM: kvm: rename cpu_reset to avoid name clash

[Olof Johansson]

On Wed, Sep 11, 2013 at 3:27 PM, Olof Johansson <olof@lixom.net> wrote:
> cpu_reset is already #defined in <asm/proc-fns.h> as processor.reset,
> so it expands here and causes problems.
>
> Signed-off-by: Olof Johansson <olof@lixom.net>

I just noticed this is broken on 3.10 too, so if/when applying feel free to add:

Cc: <stable@vger.kernel.org> # 3.10+


-Olof

[PATCH] ARM: kvm: rename cpu_reset to avoid name clash

[Olof Johansson]

On Wed, Sep 11, 2013 at 3:27 PM, Olof Johansson <olof@lixom.net> wrote:
> cpu_reset is already #defined in <asm/proc-fns.h> as processor.reset,
> so it expands here and causes problems.
>
> Signed-off-by: Olof Johansson <olof@lixom.net>

I just noticed this is broken on 3.10 too, so if/when applying feel free to add:

Cc: <stable@vger.kernel.org> # 3.10+


-Olof

[PATCH] ARM: kvm: rename cpu_reset to avoid name clash

[Olof Johansson]

cpu_reset is already #defined in <asm/proc-fns.h> as processor.reset,
so it expands here and causes problems.

Signed-off-by: Olof Johansson <olof@lixom.net>
---
 arch/arm/kvm/reset.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/kvm/reset.c b/arch/arm/kvm/reset.c
index 71e08ba..c02ba4a 100644
--- a/arch/arm/kvm/reset.c
+++ b/arch/arm/kvm/reset.c
@@ -58,14 +58,14 @@ static const struct kvm_irq_level a15_vtimer_irq = {
  */
 int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
 {
-	struct kvm_regs *cpu_reset;
+	struct kvm_regs *reset_regs;
 	const struct kvm_irq_level *cpu_vtimer_irq;
 
 	switch (vcpu->arch.target) {
 	case KVM_ARM_TARGET_CORTEX_A15:
 		if (vcpu->vcpu_id > a15_max_cpu_idx)
 			return -EINVAL;
-		cpu_reset = &a15_regs_reset;
+		reset_regs = &a15_regs_reset;
 		vcpu->arch.midr = read_cpuid_id();
 		cpu_vtimer_irq = &a15_vtimer_irq;
 		break;
@@ -74,7 +74,7 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
 	}
 
 	/* Reset core registers */
-	memcpy(&vcpu->arch.regs, cpu_reset, sizeof(vcpu->arch.regs));
+	memcpy(&vcpu->arch.regs, reset_regs, sizeof(vcpu->arch.regs));
 
 	/* Reset CP15 registers */
 	kvm_reset_coprocs(vcpu);
-- 
1.7.10.4

[PATCH] ARM: kvm: rename cpu_reset to avoid name clash

[Olof Johansson]

cpu_reset is already #defined in <asm/proc-fns.h> as processor.reset,
so it expands here and causes problems.

Signed-off-by: Olof Johansson <olof@lixom.net>
---
 arch/arm/kvm/reset.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/kvm/reset.c b/arch/arm/kvm/reset.c
index 71e08ba..c02ba4a 100644
--- a/arch/arm/kvm/reset.c
+++ b/arch/arm/kvm/reset.c
@@ -58,14 +58,14 @@ static const struct kvm_irq_level a15_vtimer_irq = {
  */
 int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
 {
-	struct kvm_regs *cpu_reset;
+	struct kvm_regs *reset_regs;
 	const struct kvm_irq_level *cpu_vtimer_irq;
 
 	switch (vcpu->arch.target) {
 	case KVM_ARM_TARGET_CORTEX_A15:
 		if (vcpu->vcpu_id > a15_max_cpu_idx)
 			return -EINVAL;
-		cpu_reset = &a15_regs_reset;
+		reset_regs = &a15_regs_reset;
 		vcpu->arch.midr = read_cpuid_id();
 		cpu_vtimer_irq = &a15_vtimer_irq;
 		break;
@@ -74,7 +74,7 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
 	}
 
 	/* Reset core registers */
-	memcpy(&vcpu->arch.regs, cpu_reset, sizeof(vcpu->arch.regs));
+	memcpy(&vcpu->arch.regs, reset_regs, sizeof(vcpu->arch.regs));
 
 	/* Reset CP15 registers */
 	kvm_reset_coprocs(vcpu);
-- 
1.7.10.4