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>
diff --git a/drivers/acpi/acpica/acdebug.h b/drivers/acpi/acpica/acdebug.h
index 68a91eb..e9ab514 100644
--- a/drivers/acpi/acpica/acdebug.h
+++ b/drivers/acpi/acpica/acdebug.h
@@ -44,6 +44,8 @@
#ifndef __ACDEBUG_H__
#define __ACDEBUG_H__
+#pragma pack(push) /* Set default struct packing */
+
#define ACPI_DEBUG_BUFFER_SIZE 0x4000 /* 16K buffer for return objects */
struct acpi_db_command_info {
@@ -282,4 +284,6 @@
void acpi_db_uint32_to_hex_string(u32 value, char *buffer);
+#pragma pack(pop) /* Restore original struct packing */
+
#endif /* __ACDEBUG_H__ */
diff --git a/drivers/acpi/acpica/acdispat.h b/drivers/acpi/acpica/acdispat.h
index 5b472c4..53b6dd6 100644
--- a/drivers/acpi/acpica/acdispat.h
+++ b/drivers/acpi/acpica/acdispat.h
@@ -44,6 +44,8 @@
#ifndef _ACDISPAT_H_
#define _ACDISPAT_H_
+#pragma pack(push) /* Set default struct packing */
+
#define NAMEOF_LOCAL_NTE "__L0"
#define NAMEOF_ARG_NTE "__A0"
@@ -351,4 +353,6 @@
acpi_ds_result_push(union acpi_operand_object *object,
struct acpi_walk_state *walk_state);
+#pragma pack(pop) /* Restore original struct packing */
+
#endif /* _ACDISPAT_H_ */
diff --git a/drivers/acpi/acpica/acevents.h b/drivers/acpi/acpica/acevents.h
index 68ec61f..75f25ed 100644
--- a/drivers/acpi/acpica/acevents.h
+++ b/drivers/acpi/acpica/acevents.h
@@ -44,6 +44,8 @@
#ifndef __ACEVENTS_H__
#define __ACEVENTS_H__
+#pragma pack(push) /* Set default struct packing */
+
/*
* evevent
*/
@@ -251,4 +253,5 @@
acpi_status acpi_ev_remove_all_sci_handlers(void);
ACPI_HW_DEPENDENT_RETURN_VOID(void acpi_ev_terminate(void))
+#pragma pack(pop) /* Restore original struct packing */
#endif /* __ACEVENTS_H__ */
diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
index b88771b..203b2dc 100644
--- a/drivers/acpi/acpica/acglobal.h
+++ b/drivers/acpi/acpica/acglobal.h
@@ -44,6 +44,8 @@
#ifndef __ACGLOBAL_H__
#define __ACGLOBAL_H__
+#pragma pack(push) /* Set default struct packing */
+
/*
* Ensure that the globals are actually defined and initialized only once.
*
@@ -520,4 +522,6 @@
extern const struct ah_predefined_name asl_predefined_info[];
+#pragma pack(pop) /* Restore original struct packing */
+
#endif /* __ACGLOBAL_H__ */
diff --git a/drivers/acpi/acpica/achware.h b/drivers/acpi/acpica/achware.h
index 2ad2351..4a0e634 100644
--- a/drivers/acpi/acpica/achware.h
+++ b/drivers/acpi/acpica/achware.h
@@ -44,6 +44,8 @@
#ifndef __ACHWARE_H__
#define __ACHWARE_H__
+#pragma pack(push) /* Set default struct packing */
+
/* Values for the _SST predefined method */
#define ACPI_SST_INDICATOR_OFF 0
@@ -147,4 +149,6 @@
acpi_hw_derive_pci_id(struct acpi_pci_id *pci_id,
acpi_handle root_pci_device, acpi_handle pci_region);
+#pragma pack(pop) /* Restore original struct packing */
+
#endif /* __ACHWARE_H__ */
diff --git a/drivers/acpi/acpica/acinterp.h b/drivers/acpi/acpica/acinterp.h
index 948a680..277f4d0 100644
--- a/drivers/acpi/acpica/acinterp.h
+++ b/drivers/acpi/acpica/acinterp.h
@@ -44,6 +44,8 @@
#ifndef __ACINTERP_H__
#define __ACINTERP_H__
+#pragma pack(push) /* Set default struct packing */
+
#define ACPI_WALK_OPERANDS (&(walk_state->operands [walk_state->num_operands -1]))
/* Macros for tables used for debug output */
@@ -531,4 +533,6 @@
u64 *value,
void *handler_context, void *region_context);
+#pragma pack(pop) /* Restore original struct packing */
+
#endif /* __INTERP_H__ */
diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
index 52a21dafb5..fee53b5 100644
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.h
@@ -44,6 +44,8 @@
#ifndef __ACLOCAL_H__
#define __ACLOCAL_H__
+#pragma pack(push) /* Set default struct packing */
+
/* acpisrc:struct_defs -- for acpisrc conversion */
#define ACPI_SERIALIZED 0xFF
@@ -1147,4 +1149,6 @@
#endif
};
+#pragma pack(pop) /* Restore original struct packing */
+
#endif /* __ACLOCAL_H__ */
diff --git a/drivers/acpi/acpica/acmacros.h b/drivers/acpi/acpica/acmacros.h
index 4bceb11..9b0ce22 100644
--- a/drivers/acpi/acpica/acmacros.h
+++ b/drivers/acpi/acpica/acmacros.h
@@ -44,6 +44,8 @@
#ifndef __ACMACROS_H__
#define __ACMACROS_H__
+#pragma pack(push) /* Set default struct packing */
+
/*
* Extract data using a pointer. Any more than a byte and we
* get into potential aligment issues -- see the STORE macros below.
@@ -427,4 +429,6 @@
#define ACPI_IS_OCTAL_DIGIT(d) (((char)(d) >= '0') && ((char)(d) <= '7'))
+#pragma pack(pop) /* Restore original struct packing */
+
#endif /* ACMACROS_H */
diff --git a/drivers/acpi/acpica/acnamesp.h b/drivers/acpi/acpica/acnamesp.h
index ee1c040..751083d 100644
--- a/drivers/acpi/acpica/acnamesp.h
+++ b/drivers/acpi/acpica/acnamesp.h
@@ -44,6 +44,8 @@
#ifndef __ACNAMESP_H__
#define __ACNAMESP_H__
+#pragma pack(push) /* Set default struct packing */
+
/* To search the entire name space, pass this as search_base */
#define ACPI_NS_ALL ((acpi_handle)0)
@@ -404,4 +406,6 @@
void acpi_ns_terminate(void);
+#pragma pack(pop) /* Restore original struct packing */
+
#endif /* __ACNAMESP_H__ */
diff --git a/drivers/acpi/acpica/acobject.h b/drivers/acpi/acpica/acobject.h
index 1a4d618..7ce7e9f 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_parse_object op;
};
-#pragma pack()
+#pragma pack(pop) /* Restore original struct packing */
#endif /* _ACOBJECT_H */
diff --git a/drivers/acpi/acpica/acparser.h b/drivers/acpi/acpica/acparser.h
index 6168b85..3d828be 100644
--- a/drivers/acpi/acpica/acparser.h
+++ b/drivers/acpi/acpica/acparser.h
@@ -44,6 +44,8 @@
#ifndef __ACPARSER_H__
#define __ACPARSER_H__
+#pragma pack(push) /* Set default struct packing */
+
#define OP_HAS_RETURN_VALUE 1
/* Variable number of arguments. This field must be 32 bits */
@@ -251,4 +253,6 @@
void acpi_ps_show(union acpi_parse_object *op);
+#pragma pack(pop) /* Restore original struct packing */
+
#endif /* __ACPARSER_H__ */
diff --git a/drivers/acpi/acpica/acpredef.h b/drivers/acpi/acpica/acpredef.h
index 9c73d6c..01b9eaa 100644
--- a/drivers/acpi/acpica/acpredef.h
+++ b/drivers/acpi/acpica/acpredef.h
@@ -44,6 +44,8 @@
#ifndef __ACPREDEF_H__
#define __ACPREDEF_H__
+#pragma pack(push) /* Set default struct packing */
+
/******************************************************************************
*
* Return Package types
@@ -1080,4 +1082,6 @@
extern const union acpi_predefined_info acpi_gbl_resource_names[];
#endif
+#pragma pack(pop) /* Restore original struct packing */
+
#endif
diff --git a/drivers/acpi/acpica/acresrc.h b/drivers/acpi/acpica/acresrc.h
index 4b008e8..be16da2 100644
--- a/drivers/acpi/acpica/acresrc.h
+++ b/drivers/acpi/acpica/acresrc.h
@@ -48,6 +48,8 @@
#include "amlresrc.h"
+#pragma pack(push) /* Set default struct packing */
+
/*
* If possible, pack the following structures to byte alignment, since we
* don't care about performance for debug output. Two cases where we cannot
@@ -378,4 +380,6 @@
extern struct acpi_rsdump_info acpi_rs_dump_general_flags[];
#endif
+#pragma pack(pop) /* Restore original struct packing */
+
#endif /* __ACRESRC_H__ */
diff --git a/drivers/acpi/acpica/acstruct.h b/drivers/acpi/acpica/acstruct.h
index 5d2989a..5a3fa0d 100644
--- a/drivers/acpi/acpica/acstruct.h
+++ b/drivers/acpi/acpica/acstruct.h
@@ -44,6 +44,8 @@
#ifndef __ACSTRUCT_H__
#define __ACSTRUCT_H__
+#pragma pack(push) /* Set default struct packing */
+
/* acpisrc:struct_defs -- for acpisrc conversion */
/*****************************************************************************
@@ -241,4 +243,6 @@
#define ACPI_DISPLAY_SHORT (u8) 2
+#pragma pack(pop) /* Restore original struct packing */
+
#endif
diff --git a/drivers/acpi/acpica/actables.h b/drivers/acpi/acpica/actables.h
index 5fa4b20..9b0f984 100644
--- a/drivers/acpi/acpica/actables.h
+++ b/drivers/acpi/acpica/actables.h
@@ -44,6 +44,8 @@
#ifndef __ACTABLES_H__
#define __ACTABLES_H__
+#pragma pack(push) /* Set default struct packing */
+
acpi_status acpi_allocate_root_table(u32 initial_table_count);
/*
@@ -129,4 +131,6 @@
acpi_status acpi_tb_parse_root_table(acpi_physical_address rsdp_address);
+#pragma pack(pop) /* Restore original struct packing */
+
#endif /* __ACTABLES_H__ */
diff --git a/drivers/acpi/acpica/acutils.h b/drivers/acpi/acpica/acutils.h
index ceeec0b..df970ff 100644
--- a/drivers/acpi/acpica/acutils.h
+++ b/drivers/acpi/acpica/acutils.h
@@ -44,6 +44,8 @@
#ifndef _ACUTILS_H
#define _ACUTILS_H
+#pragma pack(push) /* Set default struct packing */
+
extern const u8 acpi_gbl_resource_aml_sizes[];
extern const u8 acpi_gbl_resource_aml_serial_bus_sizes[];
@@ -737,4 +739,6 @@
struct acpi_namespace_node *node,
const char *path, acpi_status lookup_status);
+#pragma pack(pop) /* Restore original struct packing */
+
#endif /* _ACUTILS_H */
diff --git a/drivers/acpi/acpica/amlcode.h b/drivers/acpi/acpica/amlcode.h
index 5908cce..2db2710 100644
--- a/drivers/acpi/acpica/amlcode.h
+++ b/drivers/acpi/acpica/amlcode.h
@@ -46,6 +46,8 @@
#ifndef __AMLCODE_H__
#define __AMLCODE_H__
+#pragma pack(push) /* Set default struct packing */
+
/* primary opcodes */
#define AML_NULL_CHAR (u16) 0x00
@@ -484,4 +486,6 @@
#define AML_METHOD_SERIALIZED 0x08
#define AML_METHOD_SYNC_LEVEL 0xF0
+#pragma pack(pop) /* Restore original struct packing */
+
#endif /* __AMLCODE_H__ */
diff --git a/drivers/acpi/acpica/amlresrc.h b/drivers/acpi/acpica/amlresrc.h
index f3f8344..334fbee 100644
--- a/drivers/acpi/acpica/amlresrc.h
+++ b/drivers/acpi/acpica/amlresrc.h
@@ -46,6 +46,8 @@
#ifndef __AMLRESRC_H
#define __AMLRESRC_H
+#pragma pack(push) /* Set default struct packing */
+
/*
* Resource descriptor tags, as defined in the ACPI specification.
* Used to symbolically reference fields within a descriptor.
@@ -449,4 +451,6 @@
u8 byte_item;
};
+#pragma pack(pop) /* Restore original struct packing */
+
#endif
diff --git a/include/acpi/acbuffer.h b/include/acpi/acbuffer.h
index 88cb477..960c76f 100644
--- a/include/acpi/acbuffer.h
+++ b/include/acpi/acbuffer.h
@@ -44,6 +44,8 @@
#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
@@ -232,4 +234,6 @@
#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 932a60d..d8a0ba8 100644
--- a/include/acpi/acconfig.h
+++ b/include/acpi/acconfig.h
@@ -44,6 +44,8 @@
#ifndef _ACCONFIG_H
#define _ACCONFIG_H
+#pragma pack(push) /* Set default struct packing */
+
/******************************************************************************
*
* Configuration options
@@ -229,4 +231,6 @@
#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 8b06e4c..f0bcb96 100644
--- a/include/acpi/acexcep.h
+++ b/include/acpi/acexcep.h
@@ -44,6 +44,8 @@
#ifndef __ACEXCEP_H__
#define __ACEXCEP_H__
+#pragma pack(push) /* Set default struct packing */
+
/* This module contains all possible exception codes for acpi_status */
/*
@@ -377,4 +379,6 @@
#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 1baae6e..247636f 100644
--- a/include/acpi/acoutput.h
+++ b/include/acpi/acoutput.h
@@ -44,6 +44,8 @@
#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
@@ -456,4 +458,6 @@
#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 f6f5f8a..a4a2cd3 100644
--- a/include/acpi/acpiosxf.h
+++ b/include/acpi/acpiosxf.h
@@ -49,6 +49,8 @@
#include <acpi/platform/acenv.h>
#include <acpi/actypes.h>
+#pragma pack(push) /* Set default struct packing */
+
/* Types for acpi_os_execute */
typedef enum {
@@ -399,4 +401,6 @@
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 51cdf1b..efa767f 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -55,6 +55,8 @@
extern u8 acpi_gbl_permanent_mmap;
+#pragma pack(push) /* Set default struct packing */
+
/*
* Globals that are publically available
*/
@@ -580,4 +582,6 @@
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 eb760ca..3c83a79 100644
--- a/include/acpi/acrestyp.h
+++ b/include/acpi/acrestyp.h
@@ -44,6 +44,8 @@
#ifndef __ACRESTYP_H__
#define __ACRESTYP_H__
+#pragma pack(push) /* Set default struct packing */
+
/*
* Definitions for Resource Attributes
*/
@@ -610,4 +612,6 @@
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 3b30e36..b32a33f 100644
--- a/include/acpi/actbl.h
+++ b/include/acpi/actbl.h
@@ -44,6 +44,8 @@
#ifndef __ACTBL_H__
#define __ACTBL_H__
+#pragma pack(push) /* Set default struct packing */
+
/*******************************************************************************
*
* Fundamental ACPI tables
@@ -404,4 +406,6 @@
#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 212c65d..b7f0b0c 100644
--- a/include/acpi/actbl1.h
+++ b/include/acpi/actbl1.h
@@ -44,6 +44,8 @@
#ifndef __ACTBL1_H__
#define __ACTBL1_H__
+#pragma pack(push) /* Set default struct packing */
+
/*******************************************************************************
*
* Additional ACPI Tables (1)
@@ -972,8 +974,6 @@
#define ACPI_SRAT_CPU_ENABLED (1) /* 00: Use affinity structure */
-/* Reset to default packing */
-
-#pragma pack()
+#pragma pack(pop) /* Restore original struct packing */
#endif /* __ACTBL1_H__ */
diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
index f337244..89a2613 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 @@
u8 units;
};
-/* Reset to default packing */
-
-#pragma pack()
+#pragma pack(pop) /* Restore original struct packing */
#endif /* __ACTBL2_H__ */
diff --git a/include/acpi/actbl3.h b/include/acpi/actbl3.h
index c2295cc..85ebeea 100644
--- a/include/acpi/actbl3.h
+++ b/include/acpi/actbl3.h
@@ -44,6 +44,8 @@
#ifndef __ACTBL3_H__
#define __ACTBL3_H__
+#pragma pack(push) /* Set default struct packing */
+
/*******************************************************************************
*
* Additional ACPI Tables (3)
@@ -622,8 +624,6 @@
u64 response_address;
};
-/* Reset to default packing */
-
-#pragma pack()
+#pragma pack(pop) /* Restore original struct packing */
#endif /* __ACTBL3_H__ */
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index e763565..c28573d 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -44,6 +44,8 @@
#ifndef __ACTYPES_H__
#define __ACTYPES_H__
+#pragma pack(push) /* Set default struct packing */
+
/* acpisrc:struct_defs -- for acpisrc conversion */
/*
@@ -1223,4 +1225,6 @@
#define ACPI_OSI_WIN_7 0x0B
#define ACPI_OSI_WIN_8 0x0C
+#pragma pack(pop) /* Restore original struct packing */
+
#endif /* __ACTYPES_H__ */