From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 11 Nov 2013 10:56:07 +0000 (+0100)
Subject: Merge tag 'kvm-arm-for-3.13-3' of git://git.linaro.org/people/cdall/linux-kvm-arm... 
X-Git-Tag: v3.13-rc1~80^2~2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=6da8ae556c11bb3b832dcc0bd077c2d563f5583f;p=linux-2.6-block.git

Merge tag 'kvm-arm-for-3.13-3' of git://git.linaro.org/people/cdall/linux-kvm-arm into kvm-next

Updates for KVM/ARM, take 3 supporting more than 4 CPUs.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Conflicts:
	arch/arm/kvm/reset.c [cpu_reset->reset_regs change; context only]
---

6da8ae556c11bb3b832dcc0bd077c2d563f5583f
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;