diff options
Diffstat (limited to '')
| -rw-r--r-- | drivers/iommu/amd/amd_iommu_types.h | 3 | ||||
| -rw-r--r-- | drivers/iommu/amd/iommu.c | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/iommu/amd/amd_iommu_types.h b/drivers/iommu/amd/amd_iommu_types.h index ce7825b4d631..7aa4f1983e40 100644 --- a/drivers/iommu/amd/amd_iommu_types.h +++ b/drivers/iommu/amd/amd_iommu_types.h @@ -529,7 +529,7 @@ struct amd_irte_ops; struct protection_domain, iop) #define io_pgtable_cfg_to_data(x) \ - container_of((x), struct amd_io_pgtable, pgtbl_cfg) + container_of((x), struct amd_io_pgtable, pgtbl.cfg) struct gcr3_tbl_info { u64 *gcr3_tbl; /* Guest CR3 table */ @@ -539,7 +539,6 @@ struct gcr3_tbl_info { }; struct amd_io_pgtable { - struct io_pgtable_cfg pgtbl_cfg; struct io_pgtable pgtbl; int mode; u64 *root; diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c index 14030adba3d0..212cc2801274 100644 --- a/drivers/iommu/amd/iommu.c +++ b/drivers/iommu/amd/iommu.c @@ -2257,7 +2257,7 @@ void protection_domain_free(struct protection_domain *domain) WARN_ON(!list_empty(&domain->dev_list)); - if (domain->iop.pgtbl_cfg.tlb) + if (domain->iop.pgtbl.cfg.tlb) free_io_pgtable_ops(&domain->iop.pgtbl.ops); if (domain->id) @@ -2315,7 +2315,8 @@ struct protection_domain *protection_domain_alloc(unsigned int type) goto out_err; } - pgtbl_ops = alloc_io_pgtable_ops(pgtable, &domain->iop.pgtbl_cfg, domain); + pgtbl_ops = + alloc_io_pgtable_ops(pgtable, &domain->iop.pgtbl.cfg, domain); if (!pgtbl_ops) goto out_err; |