Commit 6e596084 authored by Robert Moore's avatar Robert Moore Committed by Rafael J. Wysocki

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: default avatarRobert Moore <Robert.Moore@intel.com>
Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent bcef5081
......@@ -44,8 +44,6 @@
#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 {
......@@ -284,6 +282,4 @@ struct acpi_namespace_node *acpi_db_local_ns_lookup(char *name);
void acpi_db_uint32_to_hex_string(u32 value, char *buffer);
#pragma pack(pop) /* Restore original struct packing */
#endif /* __ACDEBUG_H__ */
......@@ -44,8 +44,6 @@
#ifndef _ACDISPAT_H_
#define _ACDISPAT_H_
#pragma pack(push) /* Set default struct packing */
#define NAMEOF_LOCAL_NTE "__L0"
#define NAMEOF_ARG_NTE "__A0"
......@@ -353,6 +351,4 @@ acpi_status
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_ */
......@@ -44,8 +44,6 @@
#ifndef __ACEVENTS_H__
#define __ACEVENTS_H__
#pragma pack(push) /* Set default struct packing */
/*
* evevent
*/
......@@ -253,5 +251,4 @@ u32 acpi_ev_install_sci_handler(void);
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__ */
......@@ -44,8 +44,6 @@
#ifndef __ACGLOBAL_H__
#define __ACGLOBAL_H__
#pragma pack(push) /* Set default struct packing */
/*
* Ensure that the globals are actually defined and initialized only once.
*
......@@ -511,6 +509,4 @@ ACPI_INIT_GLOBAL(ACPI_FILE, acpi_gbl_debug_file, NULL);
extern const struct ah_predefined_name asl_predefined_info[];
#pragma pack(pop) /* Restore original struct packing */
#endif /* __ACGLOBAL_H__ */
......@@ -44,8 +44,6 @@
#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
......@@ -149,6 +147,4 @@ acpi_status
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__ */
......@@ -44,8 +44,6 @@
#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 */
......@@ -537,6 +535,4 @@ acpi_ex_data_table_space_handler(u32 function,
u64 *value,
void *handler_context, void *region_context);
#pragma pack(pop) /* Restore original struct packing */
#endif /* __INTERP_H__ */
......@@ -44,8 +44,6 @@
#ifndef __ACLOCAL_H__
#define __ACLOCAL_H__
#pragma pack(push) /* Set default struct packing */
/* acpisrc:struct_defs -- for acpisrc conversion */
#define ACPI_SERIALIZED 0xFF
......@@ -1149,6 +1147,4 @@ struct ah_predefined_name {
#endif
};
#pragma pack(pop) /* Restore original struct packing */
#endif /* __ACLOCAL_H__ */
......@@ -44,8 +44,6 @@
#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.
......@@ -429,6 +427,4 @@
#define ACPI_IS_OCTAL_DIGIT(d) (((char)(d) >= '0') && ((char)(d) <= '7'))
#pragma pack(pop) /* Restore original struct packing */
#endif /* ACMACROS_H */
......@@ -44,8 +44,6 @@
#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)
......@@ -406,6 +404,4 @@ struct acpi_namespace_node *acpi_ns_validate_handle(acpi_handle handle);
void acpi_ns_terminate(void);
#pragma pack(pop) /* Restore original struct packing */
#endif /* __ACNAMESP_H__ */
......@@ -44,8 +44,6 @@
#ifndef _ACOBJECT_H
#define _ACOBJECT_H
#pragma pack(push) /* Set default struct packing */
/* acpisrc:struct_defs -- for acpisrc conversion */
/*
......@@ -458,6 +456,6 @@ union acpi_descriptor {
union acpi_parse_object op;
};
#pragma pack(pop) /* Restore original struct packing */
#pragma pack()
#endif /* _ACOBJECT_H */
......@@ -44,8 +44,6 @@
#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 */
......@@ -253,6 +251,4 @@ acpi_ps_sprint_op(char *buffer_start,
void acpi_ps_show(union acpi_parse_object *op);
#pragma pack(pop) /* Restore original struct packing */
#endif /* __ACPARSER_H__ */
......@@ -44,8 +44,6 @@
#ifndef __ACPREDEF_H__
#define __ACPREDEF_H__
#pragma pack(push) /* Set default struct packing */
/******************************************************************************
*
* Return Package types
......@@ -1088,6 +1086,4 @@ static const union acpi_predefined_info acpi_gbl_scope_names[] = {
extern const union acpi_predefined_info acpi_gbl_resource_names[];
#endif
#pragma pack(pop) /* Restore original struct packing */
#endif
......@@ -48,8 +48,6 @@
#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
......@@ -380,6 +378,4 @@ extern struct acpi_rsdump_info acpi_rs_dump_uart_serial_bus[];
extern struct acpi_rsdump_info acpi_rs_dump_general_flags[];
#endif
#pragma pack(pop) /* Restore original struct packing */
#endif /* __ACRESRC_H__ */
......@@ -44,8 +44,6 @@
#ifndef __ACSTRUCT_H__
#define __ACSTRUCT_H__
#pragma pack(push) /* Set default struct packing */
/* acpisrc:struct_defs -- for acpisrc conversion */
/*****************************************************************************
......@@ -243,6 +241,4 @@ struct acpi_walk_info {
#define ACPI_DISPLAY_SHORT (u8) 2
#pragma pack(pop) /* Restore original struct packing */
#endif
......@@ -44,8 +44,6 @@
#ifndef __ACTABLES_H__
#define __ACTABLES_H__
#pragma pack(push) /* Set default struct packing */
acpi_status acpi_allocate_root_table(u32 initial_table_count);
/*
......@@ -131,6 +129,4 @@ acpi_tb_install_table(acpi_physical_address address,
acpi_status acpi_tb_parse_root_table(acpi_physical_address rsdp_address);
#pragma pack(pop) /* Restore original struct packing */
#endif /* __ACTABLES_H__ */
......@@ -44,8 +44,6 @@
#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[];
......@@ -739,6 +737,4 @@ acpi_ut_method_error(const char *module_name,
struct acpi_namespace_node *node,
const char *path, acpi_status lookup_status);
#pragma pack(pop) /* Restore original struct packing */
#endif /* _ACUTILS_H */
......@@ -46,8 +46,6 @@
#ifndef __AMLCODE_H__
#define __AMLCODE_H__
#pragma pack(push) /* Set default struct packing */
/* primary opcodes */
#define AML_NULL_CHAR (u16) 0x00
......@@ -486,6 +484,4 @@ typedef enum {
#define AML_METHOD_SERIALIZED 0x08
#define AML_METHOD_SYNC_LEVEL 0xF0
#pragma pack(pop) /* Restore original struct packing */
#endif /* __AMLCODE_H__ */
......@@ -46,8 +46,6 @@
#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.
......@@ -451,6 +449,4 @@ union aml_resource {
u8 byte_item;
};
#pragma pack(pop) /* Restore original struct packing */
#endif
......@@ -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 @@ struct acpi_pld_info {
#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 */
......@@ -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 */
......@@ -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 @@ static const struct acpi_exception_info acpi_gbl_exception_names_ctrl[] = {
#endif /* EXCEPTION_TABLE */
#pragma pack(pop) /* Restore original struct packing */
#endif /* __ACEXCEP_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__ */
......@@ -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 @@ char *acpi_os_get_next_filename(void *dir_handle);
void acpi_os_close_directory(void *dir_handle);
#endif
#pragma pack(pop) /* Restore original struct packing */
#endif /* __ACPIOSXF_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 @@ acpi_debug_print_raw(u32 requested_debug_level,
u32 component_id, const char *format, ...);
#endif
#pragma pack(pop) /* Restore original struct packing */
#endif /* __ACXFACE_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 @@ struct acpi_pci_routing_table {
char source[4]; /* pad to 64 bits so sizeof() works in all cases */
};
#pragma pack(pop) /* Restore original struct packing */
#endif /* __ACRESTYP_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 @@ struct acpi_table_desc {
#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__ */
......@@ -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__ */
......@@ -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 @@ struct acpi_table_wdrt {
u8 units;
};
#pragma pack(pop) /* Restore original struct packing */
/* Reset to default packing */
#pragma pack()
#endif /* __ACTBL2_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__ */
......@@ -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 @@ struct acpi_memory_list {
#define ACPI_OSI_WIN_7 0x0B
#define ACPI_OSI_WIN_8 0x0C
#pragma pack(pop) /* Restore original struct packing */
#endif /* __ACTYPES_H__ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment