1 files changed, 37 insertions, 47 deletions

diff --git a/include/acpi/aclocal.h b/include/acpi/aclocal.h
index 030e641115cb..4d2635698e10 100644
--- a/include/acpi/aclocal.h
+++ b/include/acpi/aclocal.h
@@ -56,6 +56,13 @@ typedef u32                                     acpi_mutex_handle;
 #define AML_NUM_OPCODES                 0x7F
 
 
+/* Forward declarations */
+
+struct acpi_walk_state        ;
+struct acpi_obj_mutex;
+union acpi_parse_object        ;
+
+
 /*****************************************************************************
  *
  * Mutex typedefs and structs
@@ -116,19 +123,24 @@ static char                         *acpi_gbl_mutex_names[] =
 #endif
 
 
+/* Owner IDs are used to track namespace nodes for selective deletion */
+
+typedef u8                                      acpi_owner_id;
+#define ACPI_OWNER_ID_MAX               0xFF
+
+/* This Thread ID means that the mutex is not in use (unlocked) */
+
+#define ACPI_MUTEX_NOT_ACQUIRED         (u32) -1
+
 /* Table for the global mutexes */
 
 struct acpi_mutex_info
 {
         acpi_mutex                          mutex;
         u32                                 use_count;
-        u32                                 owner_id;
+        u32                                 thread_id;
 };
 
-/* This owner ID means that the mutex is not in use (unlocked) */
-
-#define ACPI_MUTEX_NOT_ACQUIRED         (u32) (-1)
-
 
 /* Lock flag parameter for various interfaces */
 
@@ -136,13 +148,6 @@ struct acpi_mutex_info
 #define ACPI_MTX_LOCK                   1
 
 
-typedef u16                                     acpi_owner_id;
-#define ACPI_OWNER_TYPE_TABLE           0x0
-#define ACPI_OWNER_TYPE_METHOD          0x1
-#define ACPI_FIRST_METHOD_ID            0x0001
-#define ACPI_FIRST_TABLE_ID             0xF000
-
-
 /* Field access granularities */
 
 #define ACPI_FIELD_BYTE_GRANULARITY     1
@@ -185,13 +190,20 @@ struct acpi_namespace_node
 {
         u8                                  descriptor;     /* Used to differentiate object descriptor types */
         u8                                  type;           /* Type associated with this name */
-        u16                                 owner_id;
+        u16                                 reference_count; /* Current count of references and children */
         union acpi_name_union               name;           /* ACPI Name, always 4 chars per ACPI spec */
         union acpi_operand_object           *object;        /* Pointer to attached ACPI object (optional) */
         struct acpi_namespace_node          *child;         /* First child */
         struct acpi_namespace_node          *peer;          /* Next peer*/
-        u16                                 reference_count; /* Current count of references and children */
+        u8                                  owner_id;       /* Who created this node */
         u8                                  flags;
+
+        /* Fields used by the ASL compiler only */
+
+#ifdef ACPI_ASL_COMPILER
+        u32                                 value;
+        union acpi_parse_object             *op;
+#endif
 };
 
 
@@ -222,7 +234,7 @@ struct acpi_table_desc
         u64                             physical_address;
         u32                             aml_length;
         acpi_size                       length;
-        acpi_owner_id                   table_id;
+        acpi_owner_id                   owner_id;
         u8                              type;
         u8                              allocation;
         u8                              loaded_into_namespace;
@@ -365,7 +377,7 @@ struct acpi_gpe_xrupt_info
         struct acpi_gpe_xrupt_info              *previous;
         struct acpi_gpe_xrupt_info              *next;
         struct acpi_gpe_block_info              *gpe_block_list_head; /* List of GPE blocks for this xrupt */
-        u32                                     interrupt_level;    /* System interrupt level */
+        u32                                     interrupt_number;   /* System interrupt number */
 };
 
 
@@ -420,13 +432,6 @@ struct acpi_field_info
 #define ACPI_CONTROL_PREDICATE_TRUE          0xC4
 
 
-/* Forward declarations */
-
-struct acpi_walk_state        ;
-struct acpi_obj_mutex;
-union acpi_parse_object        ;
-
-
 #define ACPI_STATE_COMMON                  /* Two 32-bit fields and a pointer */\
         u8                                  data_type;          /* To differentiate various internal objs */\
         u8                                  flags;      \
@@ -737,6 +742,7 @@ struct acpi_parse_state
  ****************************************************************************/
 
 #define PCI_ROOT_HID_STRING         "PNP0A03"
+#define PCI_EXPRESS_ROOT_HID_STRING "PNP0A08"
 
 struct acpi_bit_register_info
 {
@@ -915,14 +921,6 @@ struct acpi_integrity_info
  *
  ****************************************************************************/
 
-struct acpi_debug_print_info
-{
-        u32                             component_id;
-        char                            *proc_name;
-        char                            *module_name;
-};
-
-
 /* Entry for a memory allocation (debug only) */
 
 #define ACPI_MEM_MALLOC                      0
@@ -952,24 +950,18 @@ struct acpi_debug_mem_block
 
 #define ACPI_MEM_LIST_GLOBAL            0
 #define ACPI_MEM_LIST_NSNODE            1
-
-#define ACPI_MEM_LIST_FIRST_CACHE_LIST  2
-#define ACPI_MEM_LIST_STATE             2
-#define ACPI_MEM_LIST_PSNODE            3
-#define ACPI_MEM_LIST_PSNODE_EXT        4
-#define ACPI_MEM_LIST_OPERAND           5
-#define ACPI_MEM_LIST_WALK              6
-#define ACPI_MEM_LIST_MAX               6
-#define ACPI_NUM_MEM_LISTS              7
+#define ACPI_MEM_LIST_MAX               1
+#define ACPI_NUM_MEM_LISTS              2
 
 
 struct acpi_memory_list
 {
+        char                                *list_name;
         void                                *list_head;
-        u16                                 link_offset;
-        u16                                 max_cache_depth;
-        u16                                 cache_depth;
         u16                                 object_size;
+        u16                                 max_depth;
+        u16                                 current_depth;
+        u16                                 link_offset;
 
 #ifdef ACPI_DBG_TRACK_ALLOCATIONS
 
@@ -978,11 +970,9 @@ struct acpi_memory_list
         u32                                 total_allocated;
         u32                                 total_freed;
         u32                                 current_total_size;
-        u32                                 cache_requests;
-        u32                                 cache_hits;
-        char                                *list_name;
+        u32                                 requests;
+        u32                                 hits;
 #endif
 };
 
-
 #endif /* __ACLOCAL_H__ */