diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2024-01-08 08:09:57 -0500 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2024-01-08 08:09:57 -0500 |
commit | fb872da8e720f8281dde01b8929419eb5ae6b033 (patch) | |
tree | ebd9be9500f7cfd550fcae98a321f66abdc3d944 /arch/arm64 | |
parent | 5f53d88f10eb07de0a9bf50e6ad21982e48fd3e3 (diff) | |
parent | 1f829359c8c37f77a340575957686ca8c4bca317 (diff) | |
download | linux-fb872da8e720f8281dde01b8929419eb5ae6b033.tar.gz linux-fb872da8e720f8281dde01b8929419eb5ae6b033.tar.bz2 linux-fb872da8e720f8281dde01b8929419eb5ae6b033.zip |
Merge tag 'kvm-x86-generic-6.8' of https://github.com/kvm-x86/linux into HEAD
Common KVM changes for 6.8:
- Use memdup_array_user() to harden against overflow.
- Unconditionally advertise KVM_CAP_DEVICE_CTRL for all architectures.
Diffstat (limited to 'arch/arm64')
-rw-r--r-- | arch/arm64/kvm/arm.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 6cb8cffa98f9..a25265aca432 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -221,7 +221,6 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) r = vgic_present; break; case KVM_CAP_IOEVENTFD: - case KVM_CAP_DEVICE_CTRL: case KVM_CAP_USER_MEMORY: case KVM_CAP_SYNC_MMU: case KVM_CAP_DESTROY_MEMORY_REGION_WORKS: |