---

yaml --- r: 252961 b: refs/heads/master c: b3a530e h: refs/heads/master i: 252959: 20b4ef6 v: v3
git-mirror · May 24, 2011 · a190cb3 · a190cb3
1 parent d0793f8
commit a190cb3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b779260b097dec295e8798277ed08ec5ecd3b2c1
+refs/heads/master: b3a530e4e734cab7043a3ab7d135f539042443a7
diff --git a/trunk/drivers/pci/dmar.c b/trunk/drivers/pci/dmar.c
@@ -698,12 +698,7 @@ int __init detect_intel_iommu(void)
 	{
 #ifdef CONFIG_INTR_REMAP
 		struct acpi_table_dmar *dmar;
-		/*
-		 * for now we will disable dma-remapping when interrupt
-		 * remapping is enabled.
-		 * When support for queued invalidation for IOTLB invalidation
-		 * is added, we will not need this any more.
-		 */
+
 		dmar = (struct acpi_table_dmar *) dmar_tbl;
 		if (ret && cpu_has_x2apic && dmar->flags & 0x1)
 			printk(KERN_INFO