Messages in this thread Patch in this message | | | Date | Tue, 15 Aug 2023 21:04:37 +1000 | From | Stephen Rothwell <> | Subject | linux-next: build failure after merge of the iommufd tree |
| |
Hi all,
After merging the iommufd tree, today's linux-next build (x86_64 allmodconfig) failed like this:
drivers/iommu/iommu.c: In function 'iommu_device_register_bus': drivers/iommu/iommu.c:335:15: error: too few arguments to function 'bus_iommu_probe' 335 | err = bus_iommu_probe(bus); | ^~~~~~~~~~~~~~~ In file included from drivers/iommu/iommu.c:20: include/linux/iommu.h:474:12: note: declared here 474 | extern int bus_iommu_probe(const struct bus_type *bus, | ^~~~~~~~~~~~~~~
Caused by commit
23a1b46f15d5 ("iommufd/selftest: Make the mock iommu driver into a real driver")
interacting with commit
2b4de976b360 ("iommu: Pass in the iommu_device to probe for in bus_iommu_probe()")
from the iommu tree.
I have applied the following fix up patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Tue, 15 Aug 2023 20:50:05 +1000 Subject: [PATCH] fix up for "iommufd/selftest: Make the mock iommu driver into a real driver"
interacting with commit
2b4de976b360 ("iommu: Pass in the iommu_device to probe for in bus_iommu_probe()")
from the iommu tree.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- drivers/iommu/iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index 20c9a0501760..1e017e1bf5ea 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -332,7 +332,7 @@ int iommu_device_register_bus(struct iommu_device *iommu, spin_unlock(&iommu_device_lock); bus->iommu_ops = ops; - err = bus_iommu_probe(bus); + err = bus_iommu_probe(bus, iommu); if (err) { iommu_device_unregister_bus(iommu, bus, nb); return err; -- 2.40.1 -- Cheers, Stephen Rothwell [unhandled content-type:application/pgp-signature] | |