diff options
| author |   Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-06 08:08:28 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-06 08:08:38 -0700 |
| commit | 163baa33552bb1c08b6bf109319505570658a8f3 (patch) | |
| tree | db130209cf27ec72ecd5a7121a3c91543badc8f3 /drivers/pci/dmar.c | |
| parent | 8250_pci: add -ENODEV code for Intel EG20T PCH (diff) | |
| parent | Linux 3.0-rc2 (diff) | |
| download | linux-dev-163baa33552bb1c08b6bf109319505570658a8f3.tar.xz linux-dev-163baa33552bb1c08b6bf109319505570658a8f3.zip | |
Merge 3.0-rc2 into tty-linus
This is needed to catch the tty patch revert in the 3.0-rc2 tree.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci/dmar.c')
| -rw-r--r-- | drivers/pci/dmar.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c index 12e02bf92c4a..3dc9befa5aec 100644 --- a/drivers/pci/dmar.c +++ b/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 |