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/kvm/handle_exit.c | |
| 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/kvm/handle_exit.c')
| -rw-r--r-- | arch/arm/kvm/handle_exit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kvm/handle_exit.c b/arch/arm/kvm/handle_exit.c index a2b4f7b82356..54442e375354 100644 --- a/arch/arm/kvm/handle_exit.c +++ b/arch/arm/kvm/handle_exit.c @@ -96,9 +96,9 @@ static exit_handle_fn arm_exit_handlers[] = { [HSR_EC_WFI] = kvm_handle_wfx, [HSR_EC_CP15_32] = kvm_handle_cp15_32, [HSR_EC_CP15_64] = kvm_handle_cp15_64, - [HSR_EC_CP14_MR] = kvm_handle_cp14_access, + [HSR_EC_CP14_MR] = kvm_handle_cp14_32, [HSR_EC_CP14_LS] = kvm_handle_cp14_load_store, - [HSR_EC_CP14_64] = kvm_handle_cp14_access, + [HSR_EC_CP14_64] = kvm_handle_cp14_64, [HSR_EC_CP_0_13] = kvm_handle_cp_0_13_access, [HSR_EC_CP10_ID] = kvm_handle_cp10_id, [HSR_EC_HVC] = handle_hvc, |