Commit-ID: 13f72756da86f155898e2c2022f7b3a106c3742e Gitweb: http://git.kernel.org/tip/13f72756da86f155898e2c2022f7b3a106c3742e Author: Linn Crosetto <l...@hp.com> AuthorDate: Tue, 23 Apr 2013 12:26:45 -0600 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Wed, 24 Apr 2013 08:45:47 +0200
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 <l...@hp.com> Cc: j...@8bytes.org Cc: ddut...@redhat.com Cc: suresh.b.sid...@intel.com Link: http://lkml.kernel.org/r/1366741605-71293-1-git-send-email-l...@hp.com Signed-off-by: Ingo Molnar <mi...@kernel.org> --- drivers/iommu/dmar.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c index e5cdaf8..b8008f6 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; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
