X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;ds=sidebyside;f=arch%2Farm%2Fkvm%2Freset.c;h=d153e64d125505c9a8623521053fbe507db83a2f;hb=01ad95d812b5be09bec8176090eda744df4edd47;hp=d9bbd834f188031ecab5fff7af21a65fd2b9e8a6;hpb=d570142674890fe10b3d7d86aa105e3dfce1ddfa;p=karo-tx-linux.git

diff --git a/arch/arm/kvm/reset.c b/arch/arm/kvm/reset.c
index d9bbd834f188..d153e64d1255 100644
--- a/arch/arm/kvm/reset.c
+++ b/arch/arm/kvm/reset.c
@@ -58,7 +58,7 @@ static const struct kvm_irq_level cortexa_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) {
@@ -66,7 +66,7 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
 	case KVM_ARM_TARGET_CORTEX_A15:
 		if (vcpu->vcpu_id > cortexa_max_cpu_idx)
 			return -EINVAL;
-		cpu_reset = &cortexa_regs_reset;
+		reset_regs = &cortexa_regs_reset;
 		vcpu->arch.midr = read_cpuid_id();
 		cpu_vtimer_irq = &cortexa_vtimer_irq;
 		break;
@@ -75,7 +75,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);