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>
diff --git a/include/acpi/acbuffer.h b/include/acpi/acbuffer.h
index 960c76f..88cb477 100644
--- a/include/acpi/acbuffer.h
+++ b/include/acpi/acbuffer.h
@@ -44,8 +44,6 @@
#ifndef __ACBUFFER_H__
#define __ACBUFFER_H__
-#pragma pack(push) /* Set default struct packing */
-
/*
* Contains buffer structures for these predefined names:
* _FDE, _GRT, _GTM, _PLD, _SRT
@@ -234,6 +232,4 @@
#define ACPI_PLD_GET_HORIZ_OFFSET(dword) ACPI_GET_BITS (dword, 16, ACPI_16BIT_MASK)
#define ACPI_PLD_SET_HORIZ_OFFSET(dword,value) ACPI_SET_BITS (dword, 16, ACPI_16BIT_MASK, value) /* Offset 128+16=144, Len 16 */
-#pragma pack(pop) /* Restore original struct packing */
-
#endif /* ACBUFFER_H */
diff --git a/include/acpi/acconfig.h b/include/acpi/acconfig.h
index d8a0ba8..932a60d 100644
--- a/include/acpi/acconfig.h
+++ b/include/acpi/acconfig.h
@@ -44,8 +44,6 @@
#ifndef _ACCONFIG_H
#define _ACCONFIG_H
-#pragma pack(push) /* Set default struct packing */
-
/******************************************************************************
*
* Configuration options
@@ -231,6 +229,4 @@
#define ACPI_DEBUGGER_COMMAND_PROMPT '-'
#define ACPI_DEBUGGER_EXECUTE_PROMPT '%'
-#pragma pack(pop) /* Restore original struct packing */
-
#endif /* _ACCONFIG_H */
diff --git a/include/acpi/acexcep.h b/include/acpi/acexcep.h
index f0bcb96..8b06e4c 100644
--- a/include/acpi/acexcep.h
+++ b/include/acpi/acexcep.h
@@ -44,8 +44,6 @@
#ifndef __ACEXCEP_H__
#define __ACEXCEP_H__
-#pragma pack(push) /* Set default struct packing */
-
/* This module contains all possible exception codes for acpi_status */
/*
@@ -379,6 +377,4 @@
#endif /* EXCEPTION_TABLE */
-#pragma pack(pop) /* Restore original struct packing */
-
#endif /* __ACEXCEP_H__ */
diff --git a/include/acpi/acoutput.h b/include/acpi/acoutput.h
index 247636f..1baae6e 100644
--- a/include/acpi/acoutput.h
+++ b/include/acpi/acoutput.h
@@ -44,8 +44,6 @@
#ifndef __ACOUTPUT_H__
#define __ACOUTPUT_H__
-#pragma pack(push) /* Set default struct packing */
-
/*
* Debug levels and component IDs. These are used to control the
* granularity of the output of the ACPI_DEBUG_PRINT macro -- on a
@@ -458,6 +456,4 @@
#endif /* ACPI_DEBUG_OUTPUT */
-#pragma pack(pop) /* Restore original struct packing */
-
#endif /* __ACOUTPUT_H__ */
diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h
index a4a2cd39..f6f5f8a 100644
--- a/include/acpi/acpiosxf.h
+++ b/include/acpi/acpiosxf.h
@@ -49,8 +49,6 @@
#include <acpi/platform/acenv.h>
#include <acpi/actypes.h>
-#pragma pack(push) /* Set default struct packing */
-
/* Types for acpi_os_execute */
typedef enum {
@@ -401,6 +399,4 @@
void acpi_os_close_directory(void *dir_handle);
#endif
-#pragma pack(pop) /* Restore original struct packing */
-
#endif /* __ACPIOSXF_H__ */
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index 943c6d7..e04f011 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -55,8 +55,6 @@
extern u8 acpi_gbl_permanent_mmap;
-#pragma pack(push) /* Set default struct packing */
-
/*
* Globals that are publically available
*/
@@ -582,6 +580,4 @@
u32 component_id, const char *format, ...);
#endif
-#pragma pack(pop) /* Restore original struct packing */
-
#endif /* __ACXFACE_H__ */
diff --git a/include/acpi/acrestyp.h b/include/acpi/acrestyp.h
index 3c83a79..eb760ca 100644
--- a/include/acpi/acrestyp.h
+++ b/include/acpi/acrestyp.h
@@ -44,8 +44,6 @@
#ifndef __ACRESTYP_H__
#define __ACRESTYP_H__
-#pragma pack(push) /* Set default struct packing */
-
/*
* Definitions for Resource Attributes
*/
@@ -612,6 +610,4 @@
char source[4]; /* pad to 64 bits so sizeof() works in all cases */
};
-#pragma pack(pop) /* Restore original struct packing */
-
#endif /* __ACRESTYP_H__ */
diff --git a/include/acpi/actbl.h b/include/acpi/actbl.h
index b32a33f..3b30e36 100644
--- a/include/acpi/actbl.h
+++ b/include/acpi/actbl.h
@@ -44,8 +44,6 @@
#ifndef __ACTBL_H__
#define __ACTBL_H__
-#pragma pack(push) /* Set default struct packing */
-
/*******************************************************************************
*
* Fundamental ACPI tables
@@ -406,6 +404,4 @@
#define ACPI_FADT_V3_SIZE (u32) (ACPI_FADT_OFFSET (sleep_control))
#define ACPI_FADT_V5_SIZE (u32) (sizeof (struct acpi_table_fadt))
-#pragma pack(pop) /* Restore original struct packing */
-
#endif /* __ACTBL_H__ */
diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h
index b7f0b0c..212c65d 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 @@
#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__ */
diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
index 89a2613..f337244 100644
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
@@ -44,8 +44,6 @@
#ifndef __ACTBL2_H__
#define __ACTBL2_H__
-#pragma pack(push) /* Set default struct packing */
-
/*******************************************************************************
*
* Additional ACPI Tables (2)
@@ -1231,6 +1229,8 @@
u8 units;
};
-#pragma pack(pop) /* Restore original struct packing */
+/* Reset to default packing */
+
+#pragma pack()
#endif /* __ACTBL2_H__ */
diff --git a/include/acpi/actbl3.h b/include/acpi/actbl3.h
index 85ebeea..c2295cc 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 @@
u64 response_address;
};
-#pragma pack(pop) /* Restore original struct packing */
+/* Reset to default packing */
+
+#pragma pack()
#endif /* __ACTBL3_H__ */
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index c28573d..e763565 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -44,8 +44,6 @@
#ifndef __ACTYPES_H__
#define __ACTYPES_H__
-#pragma pack(push) /* Set default struct packing */
-
/* acpisrc:struct_defs -- for acpisrc conversion */
/*
@@ -1225,6 +1223,4 @@
#define ACPI_OSI_WIN_7 0x0B
#define ACPI_OSI_WIN_8 0x0C
-#pragma pack(pop) /* Restore original struct packing */
-
#endif /* __ACTYPES_H__ */