From 7a1392a4c2a167acd77a582e5d07507a5cc28069 Mon Sep 17 00:00:00 2001
From: Youquan Song <youquan.song@intel.com>
Date: Mon, 7 Sep 2009 10:58:07 -0400
Subject: [PATCH] --- yaml --- r: 165427 b: refs/heads/master c:
 e936d0773df172ec8600777fdd72bbc1f75f22ad h: refs/heads/master i:   165425:
 a8502e82ee8ba461fdc07459ac3c632d96ae7fa2   165423:
 0f6982d3bf576d938e21d230c29be12b603722a3 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/pci/dmar.c           | 3 ---
 trunk/drivers/pci/intr_remapping.c | 5 +++++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index a262a1afd792..c21c57f5d51c 100644
--- 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
index 3264b626725a..fba4f6891680 100644
--- 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
index 4f5b8712931f..ebfa47b79c5b 100644
--- 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;