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 /include/acpi/actbl2.h | |
| parent | 4dde507fc1984435f28862ddd1beb90822aa116c (diff) | |
| download | linux-stable-4ac4c5fad8a320f75cb84543403fb8bae5ad2254.tar.gz linux-stable-4ac4c5fad8a320f75cb84543403fb8bae5ad2254.tar.bz2 linux-stable-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 'include/acpi/actbl2.h')
| -rw-r--r-- | include/acpi/actbl2.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h index f3372441e3a5..89a26135745b 100644 --- a/include/acpi/actbl2.h +++ b/include/acpi/actbl2.h @@ -44,6 +44,8 @@ #ifndef __ACTBL2_H__ #define __ACTBL2_H__ +#pragma pack(push) /* Set default struct packing */ + /******************************************************************************* * * Additional ACPI Tables (2) @@ -1229,8 +1231,6 @@ struct acpi_table_wdrt { u8 units; }; -/* Reset to default packing */ - -#pragma pack() +#pragma pack(pop) /* Restore original struct packing */ #endif /* __ACTBL2_H__ */ |