1 files changed, 12 insertions, 7 deletions

diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
index 24b8faa5c395..147a7e6bd38f 100644
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.h
@@ -213,12 +213,12 @@ struct acpi_namespace_node {
 #define ANOBJ_IS_BIT_OFFSET             0x40    /* i_aSL only: Reference is a bit offset */
 #define ANOBJ_IS_REFERENCED             0x80    /* i_aSL only: Object was referenced */
 
-/* One internal RSDT for table management */
+/* Internal ACPI table management - master table list */
 
-struct acpi_internal_rsdt {
-        struct acpi_table_desc *tables;
-        u32 count;
-        u32 size;
+struct acpi_table_list {
+        struct acpi_table_desc *tables; /* Table descriptor array */
+        u32 current_table_count;        /* Tables currently in the array */
+        u32 max_table_count;    /* Max tables array will hold */
         u8 flags;
 };
 
@@ -427,8 +427,8 @@ struct acpi_gpe_event_info {
         struct acpi_gpe_register_info *register_info;   /* Backpointer to register info */
         u8 flags;               /* Misc info about this GPE */
         u8 gpe_number;          /* This GPE */
-        u8 runtime_count;
-        u8 wakeup_count;
+        u8 runtime_count;       /* References to a run GPE */
+        u8 wakeup_count;        /* References to a wake GPE */
 };
 
 /* Information about a GPE register pair, one per each status/enable pair in an array */
@@ -454,6 +454,7 @@ struct acpi_gpe_block_info {
         struct acpi_gpe_event_info *event_info; /* One for each GPE */
         struct acpi_generic_address block_address;      /* Base address of the block */
         u32 register_count;     /* Number of register pairs in block */
+        u16 gpe_count;          /* Number of individual GPEs in block */
         u8 block_base_number;   /* Base GPE number for this block */
 };
 
@@ -469,6 +470,10 @@ struct acpi_gpe_xrupt_info {
 struct acpi_gpe_walk_info {
         struct acpi_namespace_node *gpe_device;
         struct acpi_gpe_block_info *gpe_block;
+        u16 count;
+        acpi_owner_id owner_id;
+        u8 enable_this_gpe;
+        u8 execute_by_owner_id;
 };
 
 struct acpi_gpe_device_info {