| Message ID | 1378938461-10835-1-git-send-email-olof@lixom.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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
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
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
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
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
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.
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
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);
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(-)