---

yaml --- r: 145900 b: refs/heads/master c: fab6afa h: refs/heads/master v: v3
git-mirror · May 28, 2009 · a343747 · a343747
1 parent 8110f0b
commit a343747
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58492e128892e3b55f1a6ef0cf3c3ab4ce7cc214
+refs/heads/master: fab6afa30954a0684ef8ac1d9a606e74a6215ab6
diff --git a/trunk/arch/x86/kernel/amd_iommu_init.c b/trunk/arch/x86/kernel/amd_iommu_init.c
@@ -826,13 +826,6 @@ static int __init iommu_setup_msix(struct amd_iommu *iommu)
 static int __init iommu_setup_msi(struct amd_iommu *iommu)
 {
 	int r;
-	struct amd_iommu *curr;
-
-	for_each_iommu(curr) {
-		if (curr->dev == iommu->dev)
-			curr->int_enabled = true;
-	}
-
 
 	if (pci_enable_msi(iommu->dev))
 		return 1;
@@ -847,6 +840,7 @@ static int __init iommu_setup_msi(struct amd_iommu *iommu)
 		return 1;
 	}
 
+	iommu->int_enabled = true;
 	iommu_feature_enable(iommu, CONTROL_EVT_INT_EN);
 
 	return 0;