Merge branches 'iommu/fixes', 'arm/qcom', 'arm/omap', 'arm/smmu', 'x86/amd', 'x86/vt-d', 'virtio' and 'core' into next

Joerg Roedel committed 6 years ago

Showing the changes to include/uapi/linux (1 of 22 files). Show all

Unified · Split

@@ -18,24 +18,24 @@ · 17 unmodified lines
18	#define VIRTIO_IOMMU_F_MMIO 5	18	#define VIRTIO_IOMMU_F_MMIO 5
19		19
20	struct virtio_iommu_range_64 {	20	struct virtio_iommu_range_64 {
21	__le64 start;	21	__u64 start;
22	__le64 end;	22	__u64 end;
23	};	23	};
24		24
25	struct virtio_iommu_range_32 {	25	struct virtio_iommu_range_32 {
26	__le32 start;	26	__u32 start;
27	__le32 end;	27	__u32 end;
28	};	28	};
29		29
30	struct virtio_iommu_config {	30	struct virtio_iommu_config {
31	/* Supported page sizes */	31	/* Supported page sizes */
32	__le64 page_size_mask;	32	__u64 page_size_mask;
33	/* Supported IOVA range */	33	/* Supported IOVA range */
34	struct virtio_iommu_range_64 input_range;	34	struct virtio_iommu_range_64 input_range;
35	/* Max domain ID size */	35	/* Max domain ID size */
36	struct virtio_iommu_range_32 domain_range;	36	struct virtio_iommu_range_32 domain_range;
37	/* Probe buffer size */	37	/* Probe buffer size */
38	__le32 probe_size;	38	__u32 probe_size;
39	};	39	};
40		40
41	/* Request types */	41	/* Request types */