ARM: kvm: rename cpu_reset to avoid name clash (ac570e04) · Commits · 戴 / test

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -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);

Admin message