summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2010-04-08 20:58:22 +0200
committerDavid Woodhouse <David.Woodhouse@intel.com>2010-04-09 17:32:18 +0200
commit5715f0f9d3814e83e5f2f754d3f7abdfa096a0b9 (patch)
tree1c32484fbfbfd0a04333db3c962db92827d36a9c /drivers
parentintel-iommu: Avoid global flushes with caching mode. (diff)
downloadlinux-5715f0f9d3814e83e5f2f754d3f7abdfa096a0b9.tar.xz
linux-5715f0f9d3814e83e5f2f754d3f7abdfa096a0b9.zip
intel-iommu: Don't complain that ACPI_DMAR_SCOPE_TYPE_IOAPIC is not supported
Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pci/dmar.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c
index ffe22bc3ac8e..a04bde9bd10f 100644
--- a/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@ -130,9 +130,10 @@ static int __init dmar_parse_dev_scope(void *start, void *end, int *cnt,
if (scope->entry_type == ACPI_DMAR_SCOPE_TYPE_ENDPOINT ||
scope->entry_type == ACPI_DMAR_SCOPE_TYPE_BRIDGE)
(*cnt)++;
- else
+ else if (scope->entry_type != ACPI_DMAR_SCOPE_TYPE_IOAPIC) {
printk(KERN_WARNING PREFIX
- "Unsupported device scope\n");
+ "Unsupported device scope\n");
+ }
start += scope->length;
}
if (*cnt == 0)