---

yaml --- r: 366248 b: refs/heads/master c: 13f7275 h: refs/heads/master v: v3
git-mirror · Apr 24, 2013 · 184808a · 184808a
1 parent 82a9137
commit 184808a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26bfc540f6f2dcbd93d0b9ed8f37830419ded7e8
+refs/heads/master: 13f72756da86f155898e2c2022f7b3a106c3742e
diff --git a/trunk/drivers/iommu/dmar.c b/trunk/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;