projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[cascardo/linux.git]
/
arch
/
arm64
/
kvm
/
hyp
/
switch.c
diff --git
a/arch/arm64/kvm/hyp/switch.c
b/arch/arm64/kvm/hyp/switch.c
index
81f21a2
..
ae7855f
100644
(file)
--- a/
arch/arm64/kvm/hyp/switch.c
+++ b/
arch/arm64/kvm/hyp/switch.c
@@
-198,7
+198,7
@@
static bool __hyp_text __translate_far_to_hpfar(u64 far, u64 *hpfar)
static bool __hyp_text __populate_fault_info(struct kvm_vcpu *vcpu)
{
u64 esr = read_sysreg_el2(esr);
- u8 ec =
esr >> ESR_ELx_EC_SHIFT
;
+ u8 ec =
ESR_ELx_EC(esr)
;
u64 hpfar, far;
vcpu->arch.fault.esr_el2 = esr;