diff options
author | Linn Crosetto <linn@hp.com> | 2013-04-23 20:26:45 +0200 |
---|---|---|
committer | Joerg Roedel <joro@8bytes.org> | 2013-04-24 19:53:31 +0200 |
commit | ae3e7f3aba4441eca7a1ff5cb3e089824318ba79 (patch) | |
tree | 2b2bfa56e8af838c0f5a7c4e5bd072518786ff19 /drivers/iommu | |
parent | iommu/vt-d: Disable translation if already enabled (diff) | |
download | linux-ae3e7f3aba4441eca7a1ff5cb3e089824318ba79.tar.xz linux-ae3e7f3aba4441eca7a1ff5cb3e089824318ba79.zip |
iommu/vt-d: Remove warning for HPET scope type
ACPI_DMAR_SCOPE_TYPE_HPET is parsed by ir_parse_ioapic_hpet_scope() and
should not be flagged as an unsupported type.
Signed-off-by: Linn Crosetto <linn@hp.com>
Signed-off-by: Joerg Roedel <joro@8bytes.org>
Diffstat (limited to 'drivers/iommu')
-rw-r--r-- | drivers/iommu/dmar.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c index f7890edb22f5..a7967ceb79e6 100644 --- a/drivers/iommu/dmar.c +++ b/drivers/iommu/dmar.c @@ -129,7 +129,8 @@ 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 if (scope->entry_type != ACPI_DMAR_SCOPE_TYPE_IOAPIC) { + else if (scope->entry_type != ACPI_DMAR_SCOPE_TYPE_IOAPIC && + scope->entry_type != ACPI_DMAR_SCOPE_TYPE_HPET) { pr_warn("Unsupported device scope\n"); } start += scope->length; |