Merge branches 'amd-iommu/fixes' and 'dma-debug/fixes' into iommu/fixes

2009-11-03 12:05:40 +01:00
parent 012abeea66 ca0207114f 59a40e7045
commit 342688f9db
4 changed files with 30 additions and 3 deletions
--- a/arch/x86/kernel/amd_iommu.c
+++ b/arch/x86/kernel/amd_iommu.c
@@ -1220,6 +1220,8 @@ static void __detach_device(struct protection_domain *domain, u16 devid)
 	amd_iommu_dev_table[devid].data[1] = 0;
 	amd_iommu_dev_table[devid].data[2] = 0;

+	amd_iommu_apply_erratum_63(devid);
+
 	/* decrease reference counter */
 	domain->dev_cnt -= 1;