From: Thierry Reding <treding@nvidia.com>
Date: Thu, 24 Oct 2013 12:58:43 +0000 (+0200)
Subject: Merge remote-tracking branch 'kvm-arm/kvm-arm-next'
X-Git-Tag: next-20131024~39
X-Git-Url: https://git.karo-electronics.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=28d1b7d96ee62f8a67254fc30766e4f777ff64ee

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

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

28d1b7d96ee62f8a67254fc30766e4f777ff64ee
diff --cc arch/arm/kvm/reset.c
index d153e64d1255,2c5add03abfa..f558c073c023
--- a/arch/arm/kvm/reset.c
+++ b/arch/arm/kvm/reset.c
@@@ -64,9 -62,7 +62,7 @@@ int kvm_reset_vcpu(struct kvm_vcpu *vcp
  	switch (vcpu->arch.target) {
  	case KVM_ARM_TARGET_CORTEX_A7:
  	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;