summaryrefslogtreecommitdiff
path: root/include/acpi/actbl1.h
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2009-07-27 14:55:02 +0800
committerLen Brown <len.brown@intel.com>2009-08-28 19:40:39 -0400
commitc276e3884163355464a76e60ed9e272b52b4acc2 (patch)
tree2e926304a0e83687d4c3dc49959f13210512bb73 /include/acpi/actbl1.h
parent7f0c826a437157d2b19662977e9cf3b472cf24a6 (diff)
downloadlinux-3.10-c276e3884163355464a76e60ed9e272b52b4acc2.tar.gz
linux-3.10-c276e3884163355464a76e60ed9e272b52b4acc2.tar.bz2
linux-3.10-c276e3884163355464a76e60ed9e272b52b4acc2.zip
ACPICA: Update definitions for HEST table
Eliminate duplicated code in disassembler. Shorten identifiers that were too long. Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Lin Ming <ming.m.lin@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/acpi/actbl1.h')
-rw-r--r--include/acpi/actbl1.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h
index 0417f2abc44..34b10c06bcf 100644
--- a/include/acpi/actbl1.h
+++ b/include/acpi/actbl1.h
@@ -427,17 +427,17 @@ struct acpi_hest_aer_common {
u16 reserved1;
u8 flags;
u8 enabled;
- u32 records_to_pre_allocate;
+ u32 records_to_preallocate;
u32 max_sections_per_record;
u32 bus;
u16 device;
u16 function;
u16 device_control;
u16 reserved2;
- u32 uncorrectable_error_mask;
- u32 uncorrectable_error_severity;
- u32 correctable_error_mask;
- u32 advanced_error_capabilities;
+ u32 uncorrectable_mask;
+ u32 uncorrectable_severity;
+ u32 correctable_mask;
+ u32 advanced_capabilities;
};
/* Masks for HEST Flags fields */
@@ -490,7 +490,7 @@ struct acpi_hest_ia_machine_check {
u16 reserved1;
u8 flags;
u8 enabled;
- u32 records_to_pre_allocate;
+ u32 records_to_preallocate;
u32 max_sections_per_record;
u64 global_capability_data;
u64 global_control_data;
@@ -505,7 +505,7 @@ struct acpi_table_hest_ia_corrected {
u16 reserved1;
u8 flags;
u8 enabled;
- u32 records_to_pre_allocate;
+ u32 records_to_preallocate;
u32 max_sections_per_record;
struct acpi_hest_notify notify;
u8 num_hardware_banks;
@@ -517,7 +517,7 @@ struct acpi_table_hest_ia_corrected {
struct acpi_hest_ia_nmi {
struct acpi_hest_header header;
u32 reserved;
- u32 records_to_pre_allocate;
+ u32 records_to_preallocate;
u32 max_sections_per_record;
u32 max_raw_data_length;
};
@@ -544,9 +544,9 @@ struct acpi_hest_aer {
struct acpi_hest_aer_bridge {
struct acpi_hest_header header;
struct acpi_hest_aer_common aer;
- u32 second_uncorrectable_error_mask;
- u32 second_uncorrectable_error_severity;
- u32 second_advanced_capabilities;
+ u32 uncorrectable_mask2;
+ u32 uncorrectable_severity2;
+ u32 advanced_capabilities2;
};
/* 9: Generic Hardware Error Source */
@@ -556,7 +556,7 @@ struct acpi_hest_generic {
u16 related_source_id;
u8 reserved;
u8 enabled;
- u32 records_to_pre_allocate;
+ u32 records_to_preallocate;
u32 max_sections_per_record;
u32 max_raw_data_length;
struct acpi_generic_address error_status_address;