summaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorLv Zheng <lv.zheng@intel.com>2014-07-08 04:08:25 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-07-08 14:22:28 +0200
commit1538ac64f532431a40e2f6c528f1ee108d5fa431 (patch)
tree68507359dc646177d3c6369e8cf44a73a069253d /include/acpi
parentACPICA: Hardware: back port of a recursive locking fix (diff)
downloadlinux-1538ac64f532431a40e2f6c528f1ee108d5fa431.tar.xz
linux-1538ac64f532431a40e2f6c528f1ee108d5fa431.zip
ACPICA: Tables: Merge DMAR table structure updates
This patch is a back port result of the following Linux commit: Author: David Woodhouse <David.Woodhouse@intel.com> Subject: iommu/vt-d: Add ACPI namespace device reporting structures ACPICA need to handle old compilers where u8 object_name[] is only allowed for an initialized variable. This patch reduces back port source code differences between Linux and ACPICA upstream. Cc: David Woodhouse <David.Woodhouse@intel.com> Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/actbl2.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
index 860e5c883eb3..21314d37cb07 100644
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
@@ -516,7 +516,7 @@ struct acpi_dmar_andd {
struct acpi_dmar_header header;
u8 reserved[3];
u8 device_number;
- u8 object_name[];
+ char object_name[1];
};
/*******************************************************************************