From fde82d8ef236579137e89a7a9017a8a8c20557cf Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 7 Jul 2022 15:48:49 +0100 Subject: [PATCH] Revert "FROMGIT: KVM: arm64: Handle host stage-2 faults from 32-bit EL0" This reverts commit f5216880de53e031428f8a10a658282bdfaecb97. Bug: 233587962 Signed-off-by: Will Deacon Change-Id: I84ba44805200eac477db1d89c997f253138811dd --- arch/arm64/kvm/hyp/nvhe/host.S | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/host.S b/arch/arm64/kvm/hyp/nvhe/host.S index 727c979b2b69..3d613e721a75 100644 --- a/arch/arm64/kvm/hyp/nvhe/host.S +++ b/arch/arm64/kvm/hyp/nvhe/host.S @@ -198,15 +198,15 @@ SYM_CODE_START(__kvm_hyp_host_vector) invalid_host_el2_vect // FIQ EL2h invalid_host_el2_vect // Error EL2h - host_el1_sync_vect // Synchronous 64-bit EL1/EL0 - invalid_host_el1_vect // IRQ 64-bit EL1/EL0 - invalid_host_el1_vect // FIQ 64-bit EL1/EL0 - invalid_host_el1_vect // Error 64-bit EL1/EL0 + host_el1_sync_vect // Synchronous 64-bit EL1 + invalid_host_el1_vect // IRQ 64-bit EL1 + invalid_host_el1_vect // FIQ 64-bit EL1 + invalid_host_el1_vect // Error 64-bit EL1 - host_el1_sync_vect // Synchronous 32-bit EL1/EL0 - invalid_host_el1_vect // IRQ 32-bit EL1/EL0 - invalid_host_el1_vect // FIQ 32-bit EL1/EL0 - invalid_host_el1_vect // Error 32-bit EL1/EL0 + invalid_host_el1_vect // Synchronous 32-bit EL1 + invalid_host_el1_vect // IRQ 32-bit EL1 + invalid_host_el1_vect // FIQ 32-bit EL1 + invalid_host_el1_vect // Error 32-bit EL1 SYM_CODE_END(__kvm_hyp_host_vector) /*