Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mirror_ubuntu-artful-kernel.git] / include / acpi / actbl2.h

diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
index f3372441e3a5269d8f9d593a5917df9e5ce04368..c8adad9c6b6a73e7d9834c5e19bc988b51b5dfa8 100644 (file)
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
@@ -424,7 +424,8 @@ enum acpi_dmar_type {
        ACPI_DMAR_TYPE_RESERVED_MEMORY = 1,
        ACPI_DMAR_TYPE_ATSR = 2,
        ACPI_DMAR_HARDWARE_AFFINITY = 3,
-       ACPI_DMAR_TYPE_RESERVED = 4     /* 4 and greater are reserved */
+       ACPI_DMAR_TYPE_ANDD = 4,
+       ACPI_DMAR_TYPE_RESERVED = 5     /* 5 and greater are reserved */
 };
 
 /* DMAR Device Scope structure */
@@ -445,7 +446,8 @@ enum acpi_dmar_scope_type {
        ACPI_DMAR_SCOPE_TYPE_BRIDGE = 2,
        ACPI_DMAR_SCOPE_TYPE_IOAPIC = 3,
        ACPI_DMAR_SCOPE_TYPE_HPET = 4,
-       ACPI_DMAR_SCOPE_TYPE_RESERVED = 5       /* 5 and greater are reserved */
+       ACPI_DMAR_SCOPE_TYPE_ACPI = 5,
+       ACPI_DMAR_SCOPE_TYPE_RESERVED = 6       /* 6 and greater are reserved */
 };
 
 struct acpi_dmar_pci_path {
@@ -507,6 +509,15 @@ struct acpi_dmar_rhsa {
        u32 proximity_domain;
 };
 
+/* 4: ACPI Namespace Device Declaration Structure */
+
+struct acpi_dmar_andd {
+       struct acpi_dmar_header header;
+       u8 reserved[3];
+       u8 device_number;
+       u8 object_name[];
+};
+
 /*******************************************************************************
  *
  * HPET - High Precision Event Timer table