tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'iommu-fixes-v5.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

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

Linus Torvalds b58f2140 75574f12

+3 -3
+1 -1
arch/ia64/include/asm/device.h
··· 6 6 #define _ASM_IA64_DEVICE_H 7 7 8 8 struct dev_archdata { 9 - #ifdef CONFIG_INTEL_IOMMU 9 + #ifdef CONFIG_IOMMU_API 10 10 void *iommu; /* hook for IOMMU specific extension */ 11 11 #endif 12 12 };
+1 -1
arch/x86/include/asm/device.h
··· 3 3 #define _ASM_X86_DEVICE_H 4 4 5 5 struct dev_archdata { 6 - #if defined(CONFIG_INTEL_IOMMU) || defined(CONFIG_AMD_IOMMU) 6 + #ifdef CONFIG_IOMMU_API 7 7 void *iommu; /* hook for IOMMU specific extension */ 8 8 #endif 9 9 };
+1 -1
drivers/iommu/iommu.c
··· 510 510 NULL, "%d", group->id); 511 511 if (ret) { 512 512 ida_simple_remove(&iommu_group_ida, group->id); 513 - kfree(group); 513 + kobject_put(&group->kobj); 514 514 return ERR_PTR(ret); 515 515 } 516 516