Merge the topic branch we're sharing with the kvm-ppc tree.
Showing the changes to include/uapi/linux (1 of 37 files). Show all
Unified · Split
| @@ -871,6 +871,8 @@ struct kvm_ppc_smmu_info { · 870 unmodified lines | ||
| 871 | 871 | #define KVM_CAP_S390_USER_INSTR0 130 |
| 872 | 872 | #define KVM_CAP_MSI_DEVID 131 |
| 873 | 873 | #define KVM_CAP_PPC_HTM 132 |
| 874 | +#define KVM_CAP_PPC_MMU_RADIX 134 | |
| 875 | +#define KVM_CAP_PPC_MMU_HASH_V3 135 | |
| 874 | 876 | |
| 875 | 877 | #ifdef KVM_CAP_IRQ_ROUTING |
| 876 | 878 | |
| @@ -1187,6 +1189,10 @@ struct kvm_s390_ucas_mapping { · 310 unmodified lines | ||
| 1187 | 1189 | #define KVM_ARM_SET_DEVICE_ADDR _IOW(KVMIO, 0xab, struct kvm_arm_device_addr) |
| 1188 | 1190 | /* Available with KVM_CAP_PPC_RTAS */ |
| 1189 | 1191 | #define KVM_PPC_RTAS_DEFINE_TOKEN _IOW(KVMIO, 0xac, struct kvm_rtas_token_args) |
| 1192 | +/* Available with KVM_CAP_PPC_RADIX_MMU or KVM_CAP_PPC_HASH_MMU_V3 */ | |
| 1193 | +#define KVM_PPC_CONFIGURE_V3_MMU _IOW(KVMIO, 0xaf, struct kvm_ppc_mmuv3_cfg) | |
| 1194 | +/* Available with KVM_CAP_PPC_RADIX_MMU */ | |
| 1195 | +#define KVM_PPC_GET_RMMU_INFO _IOW(KVMIO, 0xb0, struct kvm_ppc_rmmu_info) | |
| 1190 | 1196 | |
| 1191 | 1197 | /* ioctl for vm fd */ |
| 1192 | 1198 | #define KVM_CREATE_DEVICE _IOWR(KVMIO, 0xe0, struct kvm_create_device) |