From: Gleb Natapov <gleb@redhat.com>
Date: Thu, 17 Oct 2013 14:04:47 +0000 (+0300)
Subject: Powerpc KVM work is based on a commit after rc4.
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=13acfd5715144518232d8e29acf7c76ef1b089d8;p=deliverable%2Flinux.git

Powerpc KVM work is based on a commit after rc4.

Merging master into next to satisfy the dependencies.

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

13acfd5715144518232d8e29acf7c76ef1b089d8
diff --cc arch/arm/kvm/reset.c
index d9bbd834f188,c02ba4af599f..d153e64d1255
--- a/arch/arm/kvm/reset.c
+++ b/arch/arm/kvm/reset.c
@@@ -62,13 -62,12 +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;
- 		cpu_reset = &cortexa_regs_reset;
 -		reset_regs = &a15_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;