From a190cb3f955fa3afe580fe8c8e04ee66dfdd8813 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Sun, 15 May 2011 12:34:55 +0200 Subject: [PATCH] --- yaml --- r: 252961 b: refs/heads/master c: b3a530e4e734cab7043a3ab7d135f539042443a7 h: refs/heads/master i: 252959: 20b4ef6e72c26750580547571a5145b80ae243d5 v: v3 --- [refs] | 2 +- trunk/drivers/pci/dmar.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index d2fa9876e7d0..3bb35c48078c 100644 --- 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 index 12e02bf92c4a..3dc9befa5aec 100644 --- 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