Merge tag 'iommu-fixes-v5.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu (b58f2140) · Commits · 戴 / test

Pull iommu fixes from Joerg Roedel: - Two build fixes for issues introduced during the merge window - A fix for a reference count leak in an error path of iommu_group_alloc() * tag 'iommu-fixes-v5.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: iommu: Fix reference count leak in iommu_group_alloc. x86: Hide the archdata.iommu field behind generic IOMMU_API ia64: Hide the archdata.iommu field behind generic IOMMU_API

arch/ia64/include/asm/device.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@
		#define _ASM_IA64_DEVICE_H

		struct dev_archdata {
		#ifdef CONFIG_INTEL_IOMMU
		#ifdef CONFIG_IOMMU_API
		void iommu; / hook for IOMMU specific extension */
		#endif
		};

arch/x86/include/asm/device.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		#define _ASM_X86_DEVICE_H

		struct dev_archdata {
		#if defined(CONFIG_INTEL_IOMMU) \|\| defined(CONFIG_AMD_IOMMU)
		#ifdef CONFIG_IOMMU_API
		void iommu; / hook for IOMMU specific extension */
		#endif
		};

drivers/iommu/iommu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -510,7 +510,7 @@ struct iommu_group *iommu_group_alloc(void)
		NULL, "%d", group->id);
		if (ret) {
		ida_simple_remove(&iommu_group_ida, group->id);
		kfree(group);
		kobject_put(&group->kobj);
		return ERR_PTR(ret);
		}

Admin message