dmar compile failure in -git

From: Jens Axboe
Date: Fri Oct 16 2020 - 17:25:37 EST


Hi,

Ran into this one yesterday:

drivers/iommu/intel/dmar.c: In function ‘free_iommu’:
drivers/iommu/intel/dmar.c:1139:41: error: ‘struct iommu_device’ has no member named ‘ops’
1139 | if (intel_iommu_enabled && iommu->iommu.ops) {
| ^
make[3]: *** [scripts/Makefile.build:283: drivers/iommu/intel/dmar.o] Error 1
make[3]: *** Waiting for unfinished jobs....
make[2]: *** [scripts/Makefile.build:500: drivers/iommu/intel] Error 2
make[1]: *** [scripts/Makefile.build:500: drivers/iommu] Error 2
make: *** [Makefile:1777: drivers] Error 2

which is due to the config I use:

axboe@amd ~/g/linux-block (master)> cat .config | grep IOMMU
# CONFIG_GART_IOMMU is not set
CONFIG_IOMMU_SUPPORT=y
# Generic IOMMU Pagetable Support
# end of Generic IOMMU Pagetable Support
# CONFIG_IOMMU_DEBUGFS is not set
# CONFIG_AMD_IOMMU is not set
# CONFIG_INTEL_IOMMU is not set
axboe@amd ~/g/linux-block (master)> cat .config | grep DMAR
CONFIG_DMAR_TABLE=y

--
Jens Axboe