diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2017-06-15 10:35:15 +0200 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2017-06-15 10:35:15 +0200 |
| commit | 6f2f10cabe73944488a62df16695c86e20d4c3f9 (patch) | |
| tree | 514fa4c6127892ed55d5a00611ce95555c3ce011 /arch/arm/include | |
| parent | KVM: arm/arm64: Don't assume initialized vgic when setting PMU IRQ (diff) | |
| parent | arm: KVM: Allow unaligned accesses at HYP (diff) | |
| download | linux-6f2f10cabe73944488a62df16695c86e20d4c3f9.tar.xz linux-6f2f10cabe73944488a62df16695c86e20d4c3f9.zip | |
Merge branch 'kvmarm-master/master' into HEAD
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/kvm_coproc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/include/asm/kvm_coproc.h b/arch/arm/include/asm/kvm_coproc.h index 4917c2f7e459..e74ab0fbab79 100644 --- a/arch/arm/include/asm/kvm_coproc.h +++ b/arch/arm/include/asm/kvm_coproc.h @@ -31,7 +31,8 @@ void kvm_register_target_coproc_table(struct kvm_coproc_target_table *table); int kvm_handle_cp10_id(struct kvm_vcpu *vcpu, struct kvm_run *run); int kvm_handle_cp_0_13_access(struct kvm_vcpu *vcpu, struct kvm_run *run); int kvm_handle_cp14_load_store(struct kvm_vcpu *vcpu, struct kvm_run *run); -int kvm_handle_cp14_access(struct kvm_vcpu *vcpu, struct kvm_run *run); +int kvm_handle_cp14_32(struct kvm_vcpu *vcpu, struct kvm_run *run); +int kvm_handle_cp14_64(struct kvm_vcpu *vcpu, struct kvm_run *run); int kvm_handle_cp15_32(struct kvm_vcpu *vcpu, struct kvm_run *run); int kvm_handle_cp15_64(struct kvm_vcpu *vcpu, struct kvm_run *run); |