* [PATCH] ARM: kvm: rename cpu_reset to avoid name clash @ 2013-09-11 22:27 ` Olof Johansson 0 siblings, 0 replies; 18+ messages in thread From: Olof Johansson @ 2013-09-11 22:27 UTC (permalink / raw) To: linux-arm-kernel 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 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH] ARM: kvm: rename cpu_reset to avoid name clash @ 2013-09-11 22:27 ` Olof Johansson 0 siblings, 0 replies; 18+ messages in thread From: Olof Johansson @ 2013-09-11 22:27 UTC (permalink / raw) To: Christoffer Dall; +Cc: kvm, kvmarm, linux-arm-kernel, 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 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH] ARM: kvm: rename cpu_reset to avoid name clash 2013-09-11 22:27 ` Olof Johansson @ 2013-09-11 22:39 ` Olof Johansson -1 siblings, 0 replies; 18+ messages in thread From: Olof Johansson @ 2013-09-11 22:39 UTC (permalink / raw) To: linux-arm-kernel 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 ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH] ARM: kvm: rename cpu_reset to avoid name clash @ 2013-09-11 22:39 ` Olof Johansson 0 siblings, 0 replies; 18+ messages in thread From: Olof Johansson @ 2013-09-11 22:39 UTC (permalink / raw) To: Christoffer Dall Cc: kvm, kvmarm, linux-arm-kernel@lists.infradead.org, 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 ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH] ARM: kvm: rename cpu_reset to avoid name clash 2013-09-11 22:39 ` Olof Johansson @ 2013-09-12 1:50 ` Christoffer Dall -1 siblings, 0 replies; 18+ messages in thread From: Christoffer Dall @ 2013-09-12 1:50 UTC (permalink / raw) To: linux-arm-kernel 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 ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH] ARM: kvm: rename cpu_reset to avoid name clash @ 2013-09-12 1:50 ` Christoffer Dall 0 siblings, 0 replies; 18+ messages in thread From: Christoffer Dall @ 2013-09-12 1:50 UTC (permalink / raw) To: Olof Johansson Cc: kvm, kvmarm, linux-arm-kernel@lists.infradead.org, Ian Campbell 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 ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH] ARM: kvm: rename cpu_reset to avoid name clash 2013-09-12 1:50 ` Christoffer Dall @ 2013-09-17 0:41 ` Olof Johansson -1 siblings, 0 replies; 18+ messages in thread From: Olof Johansson @ 2013-09-17 0:41 UTC (permalink / raw) To: linux-arm-kernel 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 ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH] ARM: kvm: rename cpu_reset to avoid name clash @ 2013-09-17 0:41 ` Olof Johansson 0 siblings, 0 replies; 18+ messages in thread From: Olof Johansson @ 2013-09-17 0:41 UTC (permalink / raw) To: Christoffer Dall Cc: kvm, kvmarm, linux-arm-kernel@lists.infradead.org, Ian Campbell 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 ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH] ARM: kvm: rename cpu_reset to avoid name clash 2013-09-17 0:41 ` Olof Johansson @ 2013-09-17 3:47 ` Christoffer Dall -1 siblings, 0 replies; 18+ messages in thread From: Christoffer Dall @ 2013-09-17 3:47 UTC (permalink / raw) To: linux-arm-kernel 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 ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH] ARM: kvm: rename cpu_reset to avoid name clash @ 2013-09-17 3:47 ` Christoffer Dall 0 siblings, 0 replies; 18+ messages in thread From: Christoffer Dall @ 2013-09-17 3:47 UTC (permalink / raw) To: Olof Johansson Cc: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, Ian Campbell 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 ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH] ARM: kvm: rename cpu_reset to avoid name clash 2013-09-17 3:47 ` Christoffer Dall @ 2013-09-23 19:59 ` Olof Johansson -1 siblings, 0 replies; 18+ messages in thread From: Olof Johansson @ 2013-09-23 19:59 UTC (permalink / raw) To: linux-arm-kernel 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 ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH] ARM: kvm: rename cpu_reset to avoid name clash @ 2013-09-23 19:59 ` Olof Johansson 0 siblings, 0 replies; 18+ messages in thread From: Olof Johansson @ 2013-09-23 19:59 UTC (permalink / raw) To: Christoffer Dall Cc: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, Ian Campbell 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 ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH] ARM: kvm: rename cpu_reset to avoid name clash 2013-09-23 19:59 ` Olof Johansson @ 2013-09-23 20:30 ` Russell King - ARM Linux -1 siblings, 0 replies; 18+ messages in thread From: Russell King - ARM Linux @ 2013-09-23 20:30 UTC (permalink / raw) To: linux-arm-kernel 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. ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH] ARM: kvm: rename cpu_reset to avoid name clash @ 2013-09-23 20:30 ` Russell King - ARM Linux 0 siblings, 0 replies; 18+ messages in thread From: Russell King - ARM Linux @ 2013-09-23 20:30 UTC (permalink / raw) To: Olof Johansson Cc: Christoffer Dall, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, Ian Campbell 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. ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH] ARM: kvm: rename cpu_reset to avoid name clash 2013-09-23 20:30 ` Russell King - ARM Linux @ 2013-09-23 21:05 ` Christoffer Dall -1 siblings, 0 replies; 18+ messages in thread From: Christoffer Dall @ 2013-09-23 21:05 UTC (permalink / raw) To: linux-arm-kernel 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 ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH] ARM: kvm: rename cpu_reset to avoid name clash @ 2013-09-23 21:05 ` Christoffer Dall 0 siblings, 0 replies; 18+ messages in thread From: Christoffer Dall @ 2013-09-23 21:05 UTC (permalink / raw) To: Russell King - ARM Linux Cc: Olof Johansson, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, Ian Campbell 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 ^ permalink raw reply [flat|nested] 18+ messages in thread
* [GIT PULL] KVM/ARM Fixes for 3.12-rc2
@ 2013-09-24 19:49 Christoffer Dall
2013-09-24 19:49 ` Christoffer Dall
0 siblings, 1 reply; 18+ messages in thread
From: Christoffer Dall @ 2013-09-24 19:49 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH] ARM: kvm: rename cpu_reset to avoid name clash 2013-09-24 19:49 [GIT PULL] KVM/ARM Fixes for 3.12-rc2 Christoffer Dall @ 2013-09-24 19:49 ` Christoffer Dall 0 siblings, 0 replies; 18+ messages in thread From: Christoffer Dall @ 2013-09-24 19:49 UTC (permalink / raw) To: linux-arm-kernel 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 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH] ARM: kvm: rename cpu_reset to avoid name clash @ 2013-09-24 19:49 ` Christoffer Dall 0 siblings, 0 replies; 18+ messages in thread From: Christoffer Dall @ 2013-09-24 19:49 UTC (permalink / raw) To: Gleb Natapov, Paolo Bonzini, kvm Cc: linux-arm-kernel, Russell King, Olof Johansson, kvmarm, stable, 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 ^ permalink raw reply related [flat|nested] 18+ messages in thread
end of thread, other threads:[~2013-09-24 19:49 UTC | newest] Thread overview: 18+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-09-11 22:27 [PATCH] ARM: kvm: rename cpu_reset to avoid name clash Olof Johansson 2013-09-11 22:27 ` Olof Johansson 2013-09-11 22:39 ` Olof Johansson 2013-09-11 22:39 ` Olof Johansson 2013-09-12 1:50 ` Christoffer Dall 2013-09-12 1:50 ` Christoffer Dall 2013-09-17 0:41 ` Olof Johansson 2013-09-17 0:41 ` Olof Johansson 2013-09-17 3:47 ` Christoffer Dall 2013-09-17 3:47 ` Christoffer Dall 2013-09-23 19:59 ` Olof Johansson 2013-09-23 19:59 ` Olof Johansson 2013-09-23 20:30 ` Russell King - ARM Linux 2013-09-23 20:30 ` Russell King - ARM Linux 2013-09-23 21:05 ` Christoffer Dall 2013-09-23 21:05 ` Christoffer Dall -- strict thread matches above, loose matches on Subject: below -- 2013-09-24 19:49 [GIT PULL] KVM/ARM Fixes for 3.12-rc2 Christoffer Dall 2013-09-24 19:49 ` [PATCH] ARM: kvm: rename cpu_reset to avoid name clash Christoffer Dall 2013-09-24 19:49 ` Christoffer Dall
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.