diff options
| author | Gleb Natapov <gleb@redhat.com> | 2013-10-17 10:04:47 -0400 |
|---|---|---|
| committer | Gleb Natapov <gleb@redhat.com> | 2013-10-17 10:41:49 -0400 |
| commit | 13acfd5715144518232d8e29acf7c76ef1b089d8 (patch) | |
| tree | 093c4311a737210bbdd3d1919f8193cb5f017241 /arch/arm/kvm | |
| parent | d570142674890fe10b3d7d86aa105e3dfce1ddfa (diff) | |
| parent | 34ec4de42be5006abdd8d0c08b306ffaa64d0d5d (diff) | |
Powerpc KVM work is based on a commit after rc4.
Merging master into next to satisfy the dependencies.
Conflicts:
arch/arm/kvm/reset.c
Diffstat (limited to 'arch/arm/kvm')
| -rw-r--r-- | arch/arm/kvm/reset.c | 6 |
1 files changed, 3 insertions, 3 deletions
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 = { | |||
| 58 | */ | 58 | */ |
| 59 | int kvm_reset_vcpu(struct kvm_vcpu *vcpu) | 59 | int kvm_reset_vcpu(struct kvm_vcpu *vcpu) |
| 60 | { | 60 | { |
| 61 | struct kvm_regs *cpu_reset; | 61 | struct kvm_regs *reset_regs; |
| 62 | const struct kvm_irq_level *cpu_vtimer_irq; | 62 | const struct kvm_irq_level *cpu_vtimer_irq; |
| 63 | 63 | ||
| 64 | switch (vcpu->arch.target) { | 64 | switch (vcpu->arch.target) { |
| @@ -66,7 +66,7 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu) | |||
| 66 | case KVM_ARM_TARGET_CORTEX_A15: | 66 | case KVM_ARM_TARGET_CORTEX_A15: |
| 67 | if (vcpu->vcpu_id > cortexa_max_cpu_idx) | 67 | if (vcpu->vcpu_id > cortexa_max_cpu_idx) |
| 68 | return -EINVAL; | 68 | return -EINVAL; |
| 69 | cpu_reset = &cortexa_regs_reset; | 69 | reset_regs = &cortexa_regs_reset; |
| 70 | vcpu->arch.midr = read_cpuid_id(); | 70 | vcpu->arch.midr = read_cpuid_id(); |
| 71 | cpu_vtimer_irq = &cortexa_vtimer_irq; | 71 | cpu_vtimer_irq = &cortexa_vtimer_irq; |
| 72 | break; | 72 | break; |
| @@ -75,7 +75,7 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu) | |||
| 75 | } | 75 | } |
| 76 | 76 | ||
| 77 | /* Reset core registers */ | 77 | /* Reset core registers */ |
| 78 | memcpy(&vcpu->arch.regs, cpu_reset, sizeof(vcpu->arch.regs)); | 78 | memcpy(&vcpu->arch.regs, reset_regs, sizeof(vcpu->arch.regs)); |
| 79 | 79 | ||
| 80 | /* Reset CP15 registers */ | 80 | /* Reset CP15 registers */ |
| 81 | kvm_reset_coprocs(vcpu); | 81 | kvm_reset_coprocs(vcpu); |