diff options
| author |   Bob Moore <robert.moore@intel.com> | 2014-02-26 10:28:32 +0800 |
|---|---|---|
| committer |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-02-27 00:45:59 +0100 |
| commit | 4ac4c5fad8a320f75cb84543403fb8bae5ad2254 (patch) | |
| tree | 93b6c6a9dbc086412a1c2603cd5b47cc4d322e1f /drivers/acpi/acpica/acobject.h | |
| parent | ACPICA: Add boot option to disable auto return object repair (diff) | |
| download | linux-dev-4ac4c5fad8a320f75cb84543403fb8bae5ad2254.tar.xz linux-dev-4ac4c5fad8a320f75cb84543403fb8bae5ad2254.zip | |
ACPICA: Headers: Deploy #pragma pack (push) and (pop).
Use push and pop to both guarantee that the correct alignment is used,
and to restore the alignment to whatever it was before the header
was included.
It is reported that the #pragma pack(push/pop) directives are not supported
by the specific GCCs, but this patch still doesn't affect kernel build
as there are already #pragma pack([1]) directives used in the old ACPICA
headers, which means there shouldn't be GCCs that are currently used to
compile the ACPI kernels do not support #pragma pack() directives.
References: https://bugs.acpica.org/show_bug.cgi?id=1058
Signed-off-by: Bob Moore <robert.moore@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 'drivers/acpi/acpica/acobject.h')
| -rw-r--r-- | drivers/acpi/acpica/acobject.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/acobject.h b/drivers/acpi/acpica/acobject.h index 1a4d61805ebc..7ce7e9f1a040 100644 --- a/drivers/acpi/acpica/acobject.h +++ b/drivers/acpi/acpica/acobject.h @@ -44,6 +44,8 @@ #ifndef _ACOBJECT_H #define _ACOBJECT_H +#pragma pack(push) /* Set default struct packing */ + /* acpisrc:struct_defs -- for acpisrc conversion */ /* @@ -456,6 +458,6 @@ union acpi_descriptor { union acpi_parse_object op; }; -#pragma pack() +#pragma pack(pop) /* Restore original struct packing */ #endif /* _ACOBJECT_H */ |