diff options
| author |   Linn Crosetto <linn@hp.com> | 2013-04-23 12:26:45 -0600 |
|---|---|---|
| committer |   Ingo Molnar <mingo@kernel.org> | 2013-04-24 08:45:47 +0200 |
| commit | 13f72756da86f155898e2c2022f7b3a106c3742e (patch) | |
| tree | 4125792ca17db393e3a8e4d792d58d37e9c8d26b /drivers/iommu | |
| parent | x86/mm/gart: Drop unnecessary check (diff) | |
| download | linux-dev-13f72756da86f155898e2c2022f7b3a106c3742e.tar.xz linux-dev-13f72756da86f155898e2c2022f7b3a106c3742e.zip | |
x86/iommu/dmar: 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>
Cc: joro@8bytes.org
Cc: ddutile@redhat.com
Cc: suresh.b.siddha@intel.com
Link: http://lkml.kernel.org/r/1366741605-71293-1-git-send-email-linn@hp.com
Signed-off-by: Ingo Molnar <mingo@kernel.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 e5cdaf87822c..b8008f679bc7 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; |