summaryrefslogtreecommitdiffstats
path: root/drivers
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 /drivers
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 'drivers')
-rw-r--r--drivers/acpi/acpica/acdebug.h4
-rw-r--r--drivers/acpi/acpica/acdispat.h4
-rw-r--r--drivers/acpi/acpica/acevents.h3
-rw-r--r--drivers/acpi/acpica/acglobal.h4
-rw-r--r--drivers/acpi/acpica/achware.h4
-rw-r--r--drivers/acpi/acpica/acinterp.h4
-rw-r--r--drivers/acpi/acpica/aclocal.h4
-rw-r--r--drivers/acpi/acpica/acmacros.h4
-rw-r--r--drivers/acpi/acpica/acnamesp.h4
-rw-r--r--drivers/acpi/acpica/acobject.h4
-rw-r--r--drivers/acpi/acpica/acparser.h4
-rw-r--r--drivers/acpi/acpica/acpredef.h4
-rw-r--r--drivers/acpi/acpica/acresrc.h4
-rw-r--r--drivers/acpi/acpica/acstruct.h4
-rw-r--r--drivers/acpi/acpica/actables.h4
-rw-r--r--drivers/acpi/acpica/acutils.h4
-rw-r--r--drivers/acpi/acpica/amlcode.h4
-rw-r--r--drivers/acpi/acpica/amlresrc.h4
18 files changed, 1 insertions, 70 deletions
diff --git a/drivers/acpi/acpica/acdebug.h b/drivers/acpi/acpica/acdebug.h
index e9ab514a96c8..68a91eb0fa48 100644
--- a/drivers/acpi/acpica/acdebug.h
+++ b/drivers/acpi/acpica/acdebug.h
@@ -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__ */
diff --git a/drivers/acpi/acpica/acdispat.h b/drivers/acpi/acpica/acdispat.h
index 53b6dd679ffa..5b472c43c31d 100644
--- a/drivers/acpi/acpica/acdispat.h
+++ b/drivers/acpi/acpica/acdispat.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_ */
diff --git a/drivers/acpi/acpica/acevents.h b/drivers/acpi/acpica/acevents.h
index 75f25eda3a6a..68ec61fff188 100644
--- a/drivers/acpi/acpica/acevents.h
+++ b/drivers/acpi/acpica/acevents.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__ */
diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
index 7cc7ffef04d2..8f40bb972ae3 100644
--- a/drivers/acpi/acpica/acglobal.h
+++ b/drivers/acpi/acpica/acglobal.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__ */
diff --git a/drivers/acpi/acpica/achware.h b/drivers/acpi/acpica/achware.h
index 4a0e63457881..2ad2351a9833 100644
--- a/drivers/acpi/acpica/achware.h
+++ b/drivers/acpi/acpica/achware.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__ */
diff --git a/drivers/acpi/acpica/acinterp.h b/drivers/acpi/acpica/acinterp.h
index fc222d69e2ab..c54267748be5 100644
--- a/drivers/acpi/acpica/acinterp.h
+++ b/drivers/acpi/acpica/acinterp.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__ */
diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
index fee53b50399b..52a21dafb540 100644
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.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__ */
diff --git a/drivers/acpi/acpica/acmacros.h b/drivers/acpi/acpica/acmacros.h
index 9b0ce226bf5d..4bceb11c7380 100644
--- a/drivers/acpi/acpica/acmacros.h
+++ b/drivers/acpi/acpica/acmacros.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 */
diff --git a/drivers/acpi/acpica/acnamesp.h b/drivers/acpi/acpica/acnamesp.h
index 751083dd7793..ee1c040f321c 100644
--- a/drivers/acpi/acpica/acnamesp.h
+++ b/drivers/acpi/acpica/acnamesp.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__ */
diff --git a/drivers/acpi/acpica/acobject.h b/drivers/acpi/acpica/acobject.h
index 7ce7e9f1a040..1a4d61805ebc 100644
--- a/drivers/acpi/acpica/acobject.h
+++ b/drivers/acpi/acpica/acobject.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 */
diff --git a/drivers/acpi/acpica/acparser.h b/drivers/acpi/acpica/acparser.h
index 3d828be9dc20..6168b85463ed 100644
--- a/drivers/acpi/acpica/acparser.h
+++ b/drivers/acpi/acpica/acparser.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__ */
diff --git a/drivers/acpi/acpica/acpredef.h b/drivers/acpi/acpica/acpredef.h
index 08c359f8a666..a48d713e9599 100644
--- a/drivers/acpi/acpica/acpredef.h
+++ b/drivers/acpi/acpica/acpredef.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
diff --git a/drivers/acpi/acpica/acresrc.h b/drivers/acpi/acpica/acresrc.h
index be16da2d9f3d..4b008e8884a1 100644
--- a/drivers/acpi/acpica/acresrc.h
+++ b/drivers/acpi/acpica/acresrc.h
@@ -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__ */
diff --git a/drivers/acpi/acpica/acstruct.h b/drivers/acpi/acpica/acstruct.h
index 5a3fa0ddc1bc..5d2989a1b68c 100644
--- a/drivers/acpi/acpica/acstruct.h
+++ b/drivers/acpi/acpica/acstruct.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
diff --git a/drivers/acpi/acpica/actables.h b/drivers/acpi/acpica/actables.h
index 9b0f9846e014..5fa4b2027697 100644
--- a/drivers/acpi/acpica/actables.h
+++ b/drivers/acpi/acpica/actables.h
@@ -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__ */
diff --git a/drivers/acpi/acpica/acutils.h b/drivers/acpi/acpica/acutils.h
index df970ffb7356..ceeec0b7ccb1 100644
--- a/drivers/acpi/acpica/acutils.h
+++ b/drivers/acpi/acpica/acutils.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 */
diff --git a/drivers/acpi/acpica/amlcode.h b/drivers/acpi/acpica/amlcode.h
index 2db27109d70e..5908ccec6aea 100644
--- a/drivers/acpi/acpica/amlcode.h
+++ b/drivers/acpi/acpica/amlcode.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__ */
diff --git a/drivers/acpi/acpica/amlresrc.h b/drivers/acpi/acpica/amlresrc.h
index 334fbeee80d2..f3f834408441 100644
--- a/drivers/acpi/acpica/amlresrc.h
+++ b/drivers/acpi/acpica/amlresrc.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