diff options
| author |   Olof Johansson <olof@lixom.net> | 2013-09-11 15:27:41 -0700 |
|---|---|---|
| committer |   Christoffer Dall <christoffer.dall@linaro.org> | 2013-09-24 11:15:05 -0700 |
| commit | ac570e0493815e0b41681c89cb50d66421429d27 (patch) | |
| tree | 957d51a1af8289437a179da0ae91c5d2088d9217 /arch | |
| parent | Merge branch 'fixes' of git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
| download | linux-dev-ac570e0493815e0b41681c89cb50d66421429d27.tar.xz linux-dev-ac570e0493815e0b41681c89cb50d66421429d27.zip | |
ARM: kvm: rename cpu_reset to avoid name clash
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/kvm/reset.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/kvm/reset.c b/arch/arm/kvm/reset.c index 71e08baee209..c02ba4af599f 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); |