diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2022-07-29 17:07:59 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2022-08-01 10:24:12 +0300 |
| commit | c4edb2babc750d829cb551a6af7cb39b2afc9fb5 (patch) | |
| tree | 03902731d6b943ebc2b1f2de9db307328b4f1557 /include | |
| parent | 63f4b210414b65aa3103c54369cacbd0b1bdf02f (diff) | |
| parent | 0982c8d859f8f7022b9fd44d421c7ec721bb41f9 (diff) | |
| download | linux-c4edb2babc750d829cb551a6af7cb39b2afc9fb5.tar.xz | |
Merge tag 'kvmarm-5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/arm64 updates for 5.20:
- Unwinder implementations for both nVHE modes (classic and
protected), complete with an overflow stack
- Rework of the sysreg access from userspace, with a complete
rewrite of the vgic-v3 view to allign with the rest of the
infrastructure
- Disagregation of the vcpu flags in separate sets to better track
their use model.
- A fix for the GICv2-on-v3 selftest
- A small set of cosmetic fixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/kvm/arm_vgic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h index 2d8f2e90edc2..4df9e73a8bb5 100644 --- a/include/kvm/arm_vgic.h +++ b/include/kvm/arm_vgic.h @@ -364,7 +364,7 @@ struct vgic_cpu { extern struct static_key_false vgic_v2_cpuif_trap; extern struct static_key_false vgic_v3_cpuif_trap; -int kvm_vgic_addr(struct kvm *kvm, unsigned long type, u64 *addr, bool write); +int kvm_set_legacy_vgic_v2_addr(struct kvm *kvm, struct kvm_arm_device_addr *dev_addr); void kvm_vgic_early_init(struct kvm *kvm); int kvm_vgic_vcpu_init(struct kvm_vcpu *vcpu); int kvm_vgic_create(struct kvm *kvm, u32 type); |