diff options
| author |   Robert Moore <Robert.Moore@intel.com> | 2014-03-05 14:12:01 +0800 |
|---|---|---|
| committer |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-18 01:53:45 +0100 |
| commit | 6e596084833b95662dfe90e1f30d83ccbd64575c (patch) | |
| tree | ca9530e294d057788b551be667f26dbb07b4277e /include/acpi/actbl1.h | |
| parent | Merge branch 'acpi-config' into acpica (diff) | |
| download | linux-dev-6e596084833b95662dfe90e1f30d83ccbd64575c.tar.xz linux-dev-6e596084833b95662dfe90e1f30d83ccbd64575c.zip | |
ACPICA: Revert "Headers: Deploy #pragma pack (push) and (pop)."
This reverts commit aae576e5faefa8ba70647efa320d4747b6375f1e.
Push and Pop are not portable "enough", and caused problems for
some ACPICA customers.
Signed-off-by: Robert 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/actbl1.h')
| -rw-r--r-- | include/acpi/actbl1.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h index b7f0b0c6ff66..212c65de75df 100644 --- a/include/acpi/actbl1.h +++ b/include/acpi/actbl1.h @@ -44,8 +44,6 @@ #ifndef __ACTBL1_H__ #define __ACTBL1_H__ -#pragma pack(push) /* Set default struct packing */ - /******************************************************************************* * * Additional ACPI Tables (1) @@ -974,6 +972,8 @@ struct acpi_srat_x2apic_cpu_affinity { #define ACPI_SRAT_CPU_ENABLED (1) /* 00: Use affinity structure */ -#pragma pack(pop) /* Restore original struct packing */ +/* Reset to default packing */ + +#pragma pack() #endif /* __ACTBL1_H__ */ |