Merge branch 'acpica-next' into linux-next

[karo-tx-linux.git] / include / acpi / actbl3.h

diff --git a/include/acpi/actbl3.h b/include/acpi/actbl3.h
index 8c61b5fe42a48417fb7b9b4080fac0ff743978a4..6585141e4b97e1dafe342f4fc200786ece1b70dd 100644 (file)
--- a/include/acpi/actbl3.h
+++ b/include/acpi/actbl3.h
@@ -277,10 +277,10 @@ struct acpi_table_gtdt {
  ******************************************************************************/
 
 #define ACPI_MPST_CHANNEL_INFO \
-       u16                             reserved1; \
        u8                              channel_id; \
-       u8                              reserved2; \
-       u16                             power_node_count;
+       u8                              reserved1[3]; \
+       u16                             power_node_count; \
+       u16                             reserved2;
 
 /* Main table */
 
@@ -304,9 +304,8 @@ struct acpi_mpst_power_node {
        u32 length;
        u64 range_address;
        u64 range_length;
-       u8 num_power_states;
-       u8 num_physical_components;
-       u16 reserved2;
+       u32 num_power_states;
+       u32 num_physical_components;
 };
 
 /* Values for Flags field above */
@@ -332,10 +331,11 @@ struct acpi_mpst_component {
 
 struct acpi_mpst_data_hdr {
        u16 characteristics_count;
+       u16 reserved;
 };
 
 struct acpi_mpst_power_data {
-       u8 revision;
+       u8 structure_id;
        u8 flags;
        u16 reserved1;
        u32 average_power;
@@ -356,10 +356,10 @@ struct acpi_mpst_shared {
        u32 signature;
        u16 pcc_command;
        u16 pcc_status;
-       u16 command_register;
-       u16 status_register;
-       u16 power_state_id;
-       u16 power_node_id;
+       u32 command_register;
+       u32 status_register;
+       u32 power_state_id;
+       u32 power_node_id;
        u64 energy_consumed;
        u64 average_power;
 };