Merge branches 'x86/vt-d', 'x86/amd', 'arm/smmu', 'arm/omap', 'generic-dma-ops' and...

[linux-block.git] / include / linux / device.h

diff --git a/include/linux/device.h b/include/linux/device.h
index 848fc71c6ba60ba57afc6f08efecabcc1e643350..3b06b6b73cbb7d1546f2df14f274a8c42a45fe63 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -42,6 +42,7 @@ struct iommu_ops;
 struct iommu_group;
 struct iommu_fwspec;
 struct dev_pin_info;
+struct iommu_param;
 
 struct bus_attribute {
        struct attribute        attr;
@@ -960,6 +961,7 @@ struct dev_links_info {
  *             device (i.e. the bus driver that discovered the device).
  * @iommu_group: IOMMU group the device belongs to.
  * @iommu_fwspec: IOMMU-specific properties supplied by firmware.
+ * @iommu_param: Per device generic IOMMU runtime data
  *
  * @offline_disabled: If set, the device is permanently online.
  * @offline:   Set after successful invocation of bus type's .offline().
@@ -1053,6 +1055,7 @@ struct device {
        void    (*release)(struct device *dev);
        struct iommu_group      *iommu_group;
        struct iommu_fwspec     *iommu_fwspec;
+       struct iommu_param      *iommu_param;
 
        bool                    offline_disabled:1;
        bool                    offline:1;