ACPICA: Tables: Merge DMAR table structure updates
authorLv Zheng <lv.zheng@intel.com>
Tue, 8 Jul 2014 02:08:25 +0000 (10:08 +0800)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 8 Jul 2014 12:22:28 +0000 (14:22 +0200)
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>
include/acpi/actbl2.h

index 860e5c883eb3cddc9b876a11437b97894d582fee..21314d37cb079415f0b900bb63cfc5d2e224d3bc 100644 (file)
@@ -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];
 };
 
 /*******************************************************************************