summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2024-05-13 16:08:32 +0300
committerMichael Ellerman <mpe@ellerman.id.au>2024-05-13 16:08:32 +0300
commit6d4e52f899d9d54cae31ad9b4584aa9504a9cfa1 (patch)
tree414ce822e3c0c197725bb53f89aeea4ad35badb5 /tools
parent7b090b6ff51b9a9f002139660672f662b95f0630 (diff)
parentb52e8cd3f835869370f8540f1bc804a47a47f02b (diff)
downloadlinux-6d4e52f899d9d54cae31ad9b4584aa9504a9cfa1.tar.xz
Merge branch 'topic/ppc-kvm' into next
Merge our KVM topic branch.
Diffstat (limited to 'tools')
-rw-r--r--tools/include/uapi/linux/kvm.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/include/uapi/linux/kvm.h b/tools/include/uapi/linux/kvm.h
index c3308536482b..4b6b635b8bd1 100644
--- a/tools/include/uapi/linux/kvm.h
+++ b/tools/include/uapi/linux/kvm.h
@@ -1502,7 +1502,7 @@ struct kvm_s390_ucas_mapping {
/* Available with KVM_CAP_SPAPR_RESIZE_HPT */
#define KVM_PPC_RESIZE_HPT_PREPARE _IOR(KVMIO, 0xad, struct kvm_ppc_resize_hpt)
#define KVM_PPC_RESIZE_HPT_COMMIT _IOR(KVMIO, 0xae, struct kvm_ppc_resize_hpt)
-/* Available with KVM_CAP_PPC_RADIX_MMU or KVM_CAP_PPC_HASH_MMU_V3 */
+/* Available with KVM_CAP_PPC_RADIX_MMU or KVM_CAP_PPC_MMU_HASH_V3 */
#define KVM_PPC_CONFIGURE_V3_MMU _IOW(KVMIO, 0xaf, struct kvm_ppc_mmuv3_cfg)
/* Available with KVM_CAP_PPC_RADIX_MMU */
#define KVM_PPC_GET_RMMU_INFO _IOW(KVMIO, 0xb0, struct kvm_ppc_rmmu_info)