* [GIT PULL] KVM/ARM Fixes for 3.12-rc2
@ 2013-09-24 19:49 Christoffer Dall
2013-09-24 19:49 ` [PATCH] ARM: kvm: rename cpu_reset to avoid name clash Christoffer Dall
2013-09-25 9:49 ` [GIT PULL] KVM/ARM Fixes for 3.12-rc2 Paolo Bonzini
0 siblings, 2 replies; 6+ 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] 6+ 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 2013-09-25 9:49 ` [GIT PULL] KVM/ARM Fixes for 3.12-rc2 Paolo Bonzini 1 sibling, 0 replies; 6+ 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] 6+ messages in thread
* [GIT PULL] KVM/ARM Fixes for 3.12-rc2 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-25 9:49 ` Paolo Bonzini 2013-10-02 20:14 ` Olof Johansson 1 sibling, 1 reply; 6+ messages in thread From: Paolo Bonzini @ 2013-09-25 9:49 UTC (permalink / raw) To: linux-arm-kernel 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [GIT PULL] KVM/ARM Fixes for 3.12-rc2 2013-09-25 9:49 ` [GIT PULL] KVM/ARM Fixes for 3.12-rc2 Paolo Bonzini @ 2013-10-02 20:14 ` Olof Johansson 2013-10-03 4:04 ` Gleb Natapov 0 siblings, 1 reply; 6+ messages in thread From: Olof Johansson @ 2013-10-02 20:14 UTC (permalink / raw) To: linux-arm-kernel 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [GIT PULL] KVM/ARM Fixes for 3.12-rc2 2013-10-02 20:14 ` Olof Johansson @ 2013-10-03 4:04 ` Gleb Natapov 2013-10-03 4:07 ` Olof Johansson 0 siblings, 1 reply; 6+ messages in thread From: Gleb Natapov @ 2013-10-03 4:04 UTC (permalink / raw) To: linux-arm-kernel 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. ^ permalink raw reply [flat|nested] 6+ messages in thread
* [GIT PULL] KVM/ARM Fixes for 3.12-rc2 2013-10-03 4:04 ` Gleb Natapov @ 2013-10-03 4:07 ` Olof Johansson 0 siblings, 0 replies; 6+ messages in thread From: Olof Johansson @ 2013-10-03 4:07 UTC (permalink / raw) To: linux-arm-kernel 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-10-03 4:07 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 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-25 9:49 ` [GIT PULL] KVM/ARM Fixes for 3.12-rc2 Paolo Bonzini 2013-10-02 20:14 ` Olof Johansson 2013-10-03 4:04 ` Gleb Natapov 2013-10-03 4:07 ` Olof Johansson
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).