From f08000cc70db018011d91bc6aed02ff4ea4e2b96 Mon Sep 17 00:00:00 2001
From: Bob Moore <robert.moore@intel.com>
Date: Wed, 31 Oct 2012 02:27:56 +0000
Subject: [PATCH] --- yaml --- r: 336655 b: refs/heads/master c:
 2d2dd50880d018e42076252f9fff16e11c567de0 h: refs/heads/master i:   336653:
 cea839cf1596c9ee07c9265200e77f08623c0951   336651:
 50cbd345c7a329f63f2c8ef58fa67ed2fcd9b18c   336647:
 078afc7f415ee9e98ac3f2838315d693a4a6a73d   336639:
 06cb8aea094fed5c94c6cb763a9aa8dd4dc2de9b v: v3

---
 [refs]                      |  2 +-
 trunk/include/acpi/actbl3.h | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 27a3394cb9bd..bda9459cbab6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00eb32550f59a15796e936418b46b5134bd23a55
+refs/heads/master: 2d2dd50880d018e42076252f9fff16e11c567de0
diff --git a/trunk/include/acpi/actbl3.h b/trunk/include/acpi/actbl3.h
index 8c61b5fe42a4..6585141e4b97 100644
--- a/trunk/include/acpi/actbl3.h
+++ b/trunk/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;
 };