---

yaml --- r: 165427 b: refs/heads/master c: e936d07 h: refs/heads/master i: 165425: a8502e8 165423: 0f6982d v: v3
git-mirror · Sep 11, 2009 · 7a1392a · 7a1392a
1 parent 909469d
commit 7a1392a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: adb2fe0277607d50f4e9ef06e1d180051a609c25
+refs/heads/master: e936d0773df172ec8600777fdd72bbc1f75f22ad
diff --git a/trunk/drivers/pci/dmar.c b/trunk/drivers/pci/dmar.c
@@ -570,9 +570,6 @@ int __init dmar_table_init(void)
 		printk(KERN_INFO PREFIX "No ATSR found\n");
 #endif
 
-#ifdef CONFIG_INTR_REMAP
-	parse_ioapics_under_ir();
-#endif
 	return 0;
 }
 

diff --git a/trunk/drivers/pci/intr_remapping.c b/trunk/drivers/pci/intr_remapping.c
@@ -626,6 +626,11 @@ int __init enable_intr_remapping(int eim)
 	struct dmar_drhd_unit *drhd;
 	int setup = 0;
 
+	if (parse_ioapics_under_ir() != 1) {
+		printk(KERN_INFO "Not enable interrupt remapping\n");
+		return -1;
+	}
+
 	for_each_drhd_unit(drhd) {
 		struct intel_iommu *iommu = drhd->iommu;