diff options
| author | Mark Brown <broonie@kernel.org> | 2026-10-01 15:32:22 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-10-01 15:32:22 +0100 |
| commit | 806122b52f8fbc22187324060d06fe6a933a2802 (patch) | |
| tree | a131d14e56a68cc7e0d9b3840366cfcb9fe8f6dd /include/linux/kvm_host.h | |
| parent | acf33e80f4433d98df46e894d906fcdd3530e4be (diff) | |
| parent | 5c313653ac5c0615fb1af694539cbe4a1224edfd (diff) | |
| download | linux-next-806122b52f8fbc22187324060d06fe6a933a2802.tar.gz linux-next-806122b52f8fbc22187324060d06fe6a933a2802.zip | |
Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git
# Conflicts:
# arch/arm64/include/asm/ptrace.h
# arch/arm64/include/asm/sysreg.h
Diffstat (limited to 'include/linux/kvm_host.h')
| -rw-r--r-- | include/linux/kvm_host.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 375c2a3b12c5..9e4c5c36e6ee 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -2649,6 +2649,7 @@ void kvm_arch_gmem_invalidate_range(struct kvm *kvm, struct kvm_gfn_range *range #endif #ifdef CONFIG_KVM_GENERIC_PRE_FAULT_MEMORY +int kvm_arch_pre_fault_allowed(struct kvm_vcpu *vcpu); long kvm_arch_vcpu_pre_fault_memory(struct kvm_vcpu *vcpu, struct kvm_pre_fault_memory *range); #endif |