From: Thierry Reding <treding@nvidia.com>
Date: Fri, 25 Oct 2013 09:47:03 +0000 (+0200)
Subject: Merge remote-tracking branch 'kvm/linux-next'
X-Git-Tag: next-20131025~31
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3b97e2ee733b4321d15df5f19ee7d48c8af9aa03;p=karo-tx-linux.git

Merge remote-tracking branch 'kvm/linux-next'

Conflicts:
	arch/arm/kvm/reset.c
---

3b97e2ee733b4321d15df5f19ee7d48c8af9aa03
diff --cc arch/arm/kvm/reset.c
index c02ba4af599f,d9bbd834f188..d153e64d1255
--- a/arch/arm/kvm/reset.c
+++ b/arch/arm/kvm/reset.c
@@@ -62,12 -62,13 +62,13 @@@ int kvm_reset_vcpu(struct kvm_vcpu *vcp
  	const struct kvm_irq_level *cpu_vtimer_irq;
  
  	switch (vcpu->arch.target) {
+ 	case KVM_ARM_TARGET_CORTEX_A7:
  	case KVM_ARM_TARGET_CORTEX_A15:
- 		if (vcpu->vcpu_id > a15_max_cpu_idx)
+ 		if (vcpu->vcpu_id > cortexa_max_cpu_idx)
  			return -EINVAL;
- 		reset_regs = &a15_regs_reset;
 -		cpu_reset = &cortexa_regs_reset;
++		reset_regs = &cortexa_regs_reset;
  		vcpu->arch.midr = read_cpuid_id();
- 		cpu_vtimer_irq = &a15_vtimer_irq;
+ 		cpu_vtimer_irq = &cortexa_vtimer_irq;
  		break;
  	default:
  		return -ENODEV;