lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Pull IOMMU fixes from Joerg Roedel:
 "Some fixes and a MAINTAINERS update to remove my lost AMD email
  address from the file.  The fixes take care of a resource leak and a
  problem on VT-d with the new IOMMU group code."

* tag 'iommu-fixes-v3.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  intel-iommu: Fix lookup in add device
  iommu/tegra-smmu.c: fix dentry reference leak in smmu_debugfs_stats_show().
  iommu/amd: Update MAINTAINERS entry
This commit is contained in:
Linus Torvalds
2012-11-20 18:49:32 -10:00
parent ca6215dfc7 3da4af0aff
commit c60b689631
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MAINTAINERS
View File

@@ -526,10 +526,10 @@ F: drivers/video/geode/
F: arch/x86/include/asm/geode.h F: arch/x86/include/asm/geode.h
AMD IOMMU (AMD-VI) AMD IOMMU (AMD-VI)
M: Joerg Roedel <joerg.roedel@amd.com> M: Joerg Roedel <joro@8bytes.org>
L: iommu@lists.linux-foundation.org L: iommu@lists.linux-foundation.org
T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
S: Supported S: Maintained
F: drivers/iommu/amd_iommu*.[ch] F: drivers/iommu/amd_iommu*.[ch]
F: include/linux/amd-iommu.h F: include/linux/amd-iommu.h

4
drivers/iommu/intel-iommu.c
View File

@@ -4108,7 +4108,7 @@ static void swap_pci_ref(struct pci_dev **from, struct pci_dev *to)
static int intel_iommu_add_device(struct device *dev) static int intel_iommu_add_device(struct device *dev)
{ {
struct pci_dev *pdev = to_pci_dev(dev); struct pci_dev *pdev = to_pci_dev(dev);
struct pci_dev *bridge, *dma_pdev; struct pci_dev *bridge, *dma_pdev = NULL;
struct iommu_group *group; struct iommu_group *group;
int ret; int ret;
@@ -4122,7 +4122,7 @@ static int intel_iommu_add_device(struct device *dev)
dma_pdev = pci_get_domain_bus_and_slot( dma_pdev = pci_get_domain_bus_and_slot(
pci_domain_nr(pdev->bus), pci_domain_nr(pdev->bus),
bridge->subordinate->number, 0); bridge->subordinate->number, 0);
else if (!dma_pdev)
dma_pdev = pci_dev_get(bridge); dma_pdev = pci_dev_get(bridge);
} else } else
dma_pdev = pci_dev_get(pdev); dma_pdev = pci_dev_get(pdev);

1
drivers/iommu/tegra-smmu.c
View File

@@ -1054,6 +1054,7 @@ static int smmu_debugfs_stats_show(struct seq_file *s, void *v)
stats[i], val, offs); stats[i], val, offs);
} }
seq_printf(s, "\n"); seq_printf(s, "\n");
dput(dent);
return 0; return 0;
} }