summaryrefslogtreecommitdiffstats
path: root/include/acpi/actbl3.h
diff options
context:
space:
mode:
authorRobert Moore <Robert.Moore@intel.com>2014-03-05 07:12:01 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-03-18 01:53:45 +0100
commit6e596084833b95662dfe90e1f30d83ccbd64575c (patch)
treeca9530e294d057788b551be667f26dbb07b4277e /include/acpi/actbl3.h
parentMerge branch 'acpi-config' into acpica (diff)
downloadlinux-6e596084833b95662dfe90e1f30d83ccbd64575c.tar.xz
linux-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/actbl3.h')
-rw-r--r--include/acpi/actbl3.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/acpi/actbl3.h b/include/acpi/actbl3.h
index 85ebeea02b81..c2295cc4a5c0 100644
--- a/include/acpi/actbl3.h
+++ b/include/acpi/actbl3.h
@@ -44,8 +44,6 @@
#ifndef __ACTBL3_H__
#define __ACTBL3_H__
-#pragma pack(push) /* Set default struct packing */
-
/*******************************************************************************
*
* Additional ACPI Tables (3)
@@ -624,6 +622,8 @@ struct acpi_tpm2_control {
u64 response_address;
};
-#pragma pack(pop) /* Restore original struct packing */
+/* Reset to default packing */
+
+#pragma pack()
#endif /* __ACTBL3_H__ */