projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'kvmarm-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmar...
[linux-2.6-microblaze.git]
/
arch
/
arm64
/
kvm
/
mmu.c
diff --git
a/arch/arm64/kvm/mmu.c
b/arch/arm64/kvm/mmu.c
index
a816cb8
..
19aacc7
100644
(file)
--- a/
arch/arm64/kvm/mmu.c
+++ b/
arch/arm64/kvm/mmu.c
@@
-759,7
+759,7
@@
static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
struct kvm_pgtable *pgt;
write_fault = kvm_is_write_fault(vcpu);
struct kvm_pgtable *pgt;
write_fault = kvm_is_write_fault(vcpu);
- exec_fault = kvm_vcpu_trap_is_
iab
t(vcpu);
+ exec_fault = kvm_vcpu_trap_is_
exec_faul
t(vcpu);
VM_BUG_ON(write_fault && exec_fault);
if (fault_status == FSC_PERM && !write_fault && !exec_fault) {
VM_BUG_ON(write_fault && exec_fault);
if (fault_status == FSC_PERM && !write_fault && !exec_fault) {
@@
-984,7
+984,7
@@
int kvm_handle_guest_abort(struct kvm_vcpu *vcpu)
goto out;
}
goto out;
}
- if (kvm_vcpu_
d
abt_iss1tw(vcpu)) {
+ if (kvm_vcpu_abt_iss1tw(vcpu)) {
kvm_inject_dabt(vcpu, kvm_vcpu_get_hfar(vcpu));
ret = 1;
goto out_unlock;
kvm_inject_dabt(vcpu, kvm_vcpu_get_hfar(vcpu));
ret = 1;
goto out_unlock;