diff options
| author |  Michael Ellerman <mpe@ellerman.id.au>
| 2024-05-13 23:08:32 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au>
| 2024-05-13 23:08:32 +1000 |
| commit | 6d4e52f899d9d54cae31ad9b4584aa9504a9cfa1 (patch) | |
| tree | 414ce822e3c0c197725bb53f89aeea4ad35badb5 /include/uapi | |
| parent | powerpc/85xx: fix compile error without CONFIG_CRASH_DUMP (diff) | |
| parent | KVM: PPC: Book3S HV nestedv2: Fix an error handling path in gs_msg_ops_kvmhv_... (diff) | |
| download | linux-6d4e52f899d9d54cae31ad9b4584aa9504a9cfa1.tar.gz linux-6d4e52f899d9d54cae31ad9b4584aa9504a9cfa1.tar.bz2 linux-6d4e52f899d9d54cae31ad9b4584aa9504a9cfa1.zip | |
Merge branch 'topic/ppc-kvm' into next
Merge our KVM topic branch.
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/kvm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index 2190adbe3002..d03842abae57 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -1221,9 +1221,9 @@ struct kvm_vfio_spapr_tce { /* 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_MMU_RADIX 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 */ +/* Available with KVM_CAP_PPC_MMU_RADIX */ #define KVM_PPC_GET_RMMU_INFO _IOW(KVMIO, 0xb0, struct kvm_ppc_rmmu_info) /* Available with KVM_CAP_PPC_GET_CPU_CHAR */ #define KVM_PPC_GET_CPU_CHAR _IOR(KVMIO, 0xb1, struct kvm_ppc_cpu_char) |