aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2010-04-08 14:58:22 -0400
committerDavid Woodhouse <David.Woodhouse@intel.com>2010-04-09 11:32:18 -0400
commit5715f0f9d3814e83e5f2f754d3f7abdfa096a0b9 (patch)
tree1c32484fbfbfd0a04333db3c962db92827d36a9c /drivers/pci
parent78d5f0f500e6ba8f6cfd0673475ff4d941d705a2 (diff)
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/pci')
-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,
130 if (scope->entry_type == ACPI_DMAR_SCOPE_TYPE_ENDPOINT || 130 if (scope->entry_type == ACPI_DMAR_SCOPE_TYPE_ENDPOINT ||
131 scope->entry_type == ACPI_DMAR_SCOPE_TYPE_BRIDGE) 131 scope->entry_type == ACPI_DMAR_SCOPE_TYPE_BRIDGE)
132 (*cnt)++; 132 (*cnt)++;
133 else 133 else if (scope->entry_type != ACPI_DMAR_SCOPE_TYPE_IOAPIC) {
134 printk(KERN_WARNING PREFIX 134 printk(KERN_WARNING PREFIX
135 "Unsupported device scope\n"); 135 "Unsupported device scope\n");
136 }
136 start += scope->length; 137 start += scope->length;
137 } 138 }
138 if (*cnt == 0) 139 if (*cnt == 0)