6 files changed, 235 insertions, 220 deletions

diff --git a/drivers/acpi/utilities/utcache.c b/drivers/acpi/utilities/utcache.c
index 07588812e72d..c0df0585c683 100644
--- a/drivers/acpi/utilities/utcache.c
+++ b/drivers/acpi/utilities/utcache.c
@@ -74,6 +74,9 @@ acpi_os_create_cache (
         struct acpi_memory_list         *cache;
 
 
+        ACPI_FUNCTION_ENTRY ();
+
+
         if (!cache_name || !return_cache || (object_size < 16)) {
                 return (AE_BAD_PARAMETER);
         }
@@ -161,7 +164,10 @@ acpi_os_delete_cache (
         acpi_status                     status;
 
 
-        /* Purge all objects in the cache */
+        ACPI_FUNCTION_ENTRY ();
+
+
+   /* Purge all objects in the cache */
 
         status = acpi_os_purge_cache (cache);
         if (ACPI_FAILURE (status)) {
@@ -259,7 +265,7 @@ acpi_os_acquire_object (
         void                            *object;
 
 
-        ACPI_FUNCTION_NAME ("ut_acquire_from_cache");
+        ACPI_FUNCTION_NAME ("os_acquire_object");
 
 
         if (!cache) {
@@ -286,7 +292,7 @@ acpi_os_acquire_object (
 
                 ACPI_MEM_TRACKING (cache->hits++);
                 ACPI_MEM_TRACKING (ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
-                        "Object %p from %s\n", object, cache->list_name)));
+                        "Object %p from %s cache\n", object, cache->list_name)));
 
                 status = acpi_ut_release_mutex (ACPI_MTX_CACHES);
                 if (ACPI_FAILURE (status)) {
diff --git a/drivers/acpi/utilities/utdebug.c b/drivers/acpi/utilities/utdebug.c
index 08362f686ec1..3d5fbc810b0b 100644
--- a/drivers/acpi/utilities/utdebug.c
+++ b/drivers/acpi/utilities/utdebug.c
@@ -116,10 +116,9 @@ acpi_ut_track_stack_ptr (
  *
  * PARAMETERS:  requested_debug_level - Requested debug print level
  *              line_number         - Caller's line number (for error output)
- *              dbg_info            - Contains:
- *                  proc_name           - Caller's procedure name
- *                  module_name         - Caller's module name
- *                  component_id        - Caller's component ID
+ *              function_name       - Caller's procedure name
+ *              module_name         - Caller's module name
+ *              component_id        - Caller's component ID
  *              Format              - Printf format field
  *              ...                 - Optional printf arguments
  *
@@ -134,7 +133,9 @@ void  ACPI_INTERNAL_VAR_XFACE
 acpi_ut_debug_print (
         u32                             requested_debug_level,
         u32                             line_number,
-        struct acpi_debug_print_info    *dbg_info,
+        char                            *function_name,
+        char                            *module_name,
+        u32                             component_id,
         char                            *format,
         ...)
 {
@@ -146,7 +147,7 @@ acpi_ut_debug_print (
          * Stay silent if the debug level or component ID is disabled
          */
         if (!(requested_debug_level & acpi_dbg_level) ||
-                !(dbg_info->component_id & acpi_dbg_layer)) {
+                !(component_id & acpi_dbg_layer)) {
                 return;
         }
 
@@ -169,14 +170,14 @@ acpi_ut_debug_print (
          * Display the module name, current line number, thread ID (if requested),
          * current procedure nesting level, and the current procedure name
          */
-        acpi_os_printf ("%8s-%04ld ", dbg_info->module_name, line_number);
+        acpi_os_printf ("%8s-%04ld ", module_name, line_number);
 
         if (ACPI_LV_THREADS & acpi_dbg_level) {
                 acpi_os_printf ("[%04lX] ", thread_id);
         }
 
         acpi_os_printf ("[%02ld] %-22.22s: ",
-                acpi_gbl_nesting_level, dbg_info->proc_name);
+                acpi_gbl_nesting_level, function_name);
 
         va_start (args, format);
         acpi_os_vprintf (format, args);
@@ -190,10 +191,9 @@ EXPORT_SYMBOL(acpi_ut_debug_print);
  *
  * PARAMETERS:  requested_debug_level - Requested debug print level
  *              line_number         - Caller's line number
- *              dbg_info            - Contains:
- *                  proc_name           - Caller's procedure name
- *                  module_name         - Caller's module name
- *                  component_id        - Caller's component ID
+ *              function_name       - Caller's procedure name
+ *              module_name         - Caller's module name
+ *              component_id        - Caller's component ID
  *              Format              - Printf format field
  *              ...                 - Optional printf arguments
  *
@@ -208,7 +208,9 @@ void  ACPI_INTERNAL_VAR_XFACE
 acpi_ut_debug_print_raw (
         u32                             requested_debug_level,
         u32                             line_number,
-        struct acpi_debug_print_info    *dbg_info,
+        char                            *function_name,
+        char                            *module_name,
+        u32                             component_id,
         char                            *format,
         ...)
 {
@@ -216,7 +218,7 @@ acpi_ut_debug_print_raw (
 
 
         if (!(requested_debug_level & acpi_dbg_level) ||
-                !(dbg_info->component_id & acpi_dbg_layer)) {
+                !(component_id & acpi_dbg_layer)) {
                 return;
         }
 
@@ -231,10 +233,9 @@ EXPORT_SYMBOL(acpi_ut_debug_print_raw);
  * FUNCTION:    acpi_ut_trace
  *
  * PARAMETERS:  line_number         - Caller's line number
- *              dbg_info            - Contains:
- *                  proc_name           - Caller's procedure name
- *                  module_name         - Caller's module name
- *                  component_id        - Caller's component ID
+ *              function_name       - Caller's procedure name
+ *              module_name         - Caller's module name
+ *              component_id        - Caller's component ID
  *
  * RETURN:      None
  *
@@ -246,14 +247,17 @@ EXPORT_SYMBOL(acpi_ut_debug_print_raw);
 void
 acpi_ut_trace (
         u32                             line_number,
-        struct acpi_debug_print_info    *dbg_info)
+        char                            *function_name,
+        char                            *module_name,
+        u32                             component_id)
 {
 
         acpi_gbl_nesting_level++;
         acpi_ut_track_stack_ptr ();
 
-        acpi_ut_debug_print (ACPI_LV_FUNCTIONS, line_number, dbg_info,
-                        "%s\n", acpi_gbl_fn_entry_str);
+        acpi_ut_debug_print (ACPI_LV_FUNCTIONS,
+                line_number, function_name, module_name, component_id,
+                "%s\n", acpi_gbl_fn_entry_str);
 }
 EXPORT_SYMBOL(acpi_ut_trace);
 
@@ -263,10 +267,9 @@ EXPORT_SYMBOL(acpi_ut_trace);
  * FUNCTION:    acpi_ut_trace_ptr
  *
  * PARAMETERS:  line_number         - Caller's line number
- *              dbg_info            - Contains:
- *                  proc_name           - Caller's procedure name
- *                  module_name         - Caller's module name
- *                  component_id        - Caller's component ID
+ *              function_name       - Caller's procedure name
+ *              module_name         - Caller's module name
+ *              component_id        - Caller's component ID
  *              Pointer             - Pointer to display
  *
  * RETURN:      None
@@ -279,14 +282,17 @@ EXPORT_SYMBOL(acpi_ut_trace);
 void
 acpi_ut_trace_ptr (
         u32                             line_number,
-        struct acpi_debug_print_info    *dbg_info,
+        char                            *function_name,
+        char                            *module_name,
+        u32                             component_id,
         void                            *pointer)
 {
         acpi_gbl_nesting_level++;
         acpi_ut_track_stack_ptr ();
 
-        acpi_ut_debug_print (ACPI_LV_FUNCTIONS, line_number, dbg_info,
-                        "%s %p\n", acpi_gbl_fn_entry_str, pointer);
+        acpi_ut_debug_print (ACPI_LV_FUNCTIONS,
+                line_number, function_name, module_name, component_id,
+                "%s %p\n", acpi_gbl_fn_entry_str, pointer);
 }
 
 
@@ -295,10 +301,9 @@ acpi_ut_trace_ptr (
  * FUNCTION:    acpi_ut_trace_str
  *
  * PARAMETERS:  line_number         - Caller's line number
- *              dbg_info            - Contains:
- *                  proc_name           - Caller's procedure name
- *                  module_name         - Caller's module name
- *                  component_id        - Caller's component ID
+ *              function_name       - Caller's procedure name
+ *              module_name         - Caller's module name
+ *              component_id        - Caller's component ID
  *              String              - Additional string to display
  *
  * RETURN:      None
@@ -311,15 +316,18 @@ acpi_ut_trace_ptr (
 void
 acpi_ut_trace_str (
         u32                             line_number,
-        struct acpi_debug_print_info    *dbg_info,
+        char                            *function_name,
+        char                            *module_name,
+        u32                             component_id,
         char                            *string)
 {
 
         acpi_gbl_nesting_level++;
         acpi_ut_track_stack_ptr ();
 
-        acpi_ut_debug_print (ACPI_LV_FUNCTIONS, line_number, dbg_info,
-                        "%s %s\n", acpi_gbl_fn_entry_str, string);
+        acpi_ut_debug_print (ACPI_LV_FUNCTIONS,
+                line_number, function_name, module_name, component_id,
+                "%s %s\n", acpi_gbl_fn_entry_str, string);
 }
 
 
@@ -328,10 +336,9 @@ acpi_ut_trace_str (
  * FUNCTION:    acpi_ut_trace_u32
  *
  * PARAMETERS:  line_number         - Caller's line number
- *              dbg_info            - Contains:
- *                  proc_name           - Caller's procedure name
- *                  module_name         - Caller's module name
- *                  component_id        - Caller's component ID
+ *              function_name       - Caller's procedure name
+ *              module_name         - Caller's module name
+ *              component_id        - Caller's component ID
  *              Integer             - Integer to display
  *
  * RETURN:      None
@@ -344,15 +351,18 @@ acpi_ut_trace_str (
 void
 acpi_ut_trace_u32 (
         u32                             line_number,
-        struct acpi_debug_print_info    *dbg_info,
+        char                            *function_name,
+        char                            *module_name,
+        u32                             component_id,
         u32                             integer)
 {
 
         acpi_gbl_nesting_level++;
         acpi_ut_track_stack_ptr ();
 
-        acpi_ut_debug_print (ACPI_LV_FUNCTIONS, line_number, dbg_info,
-                        "%s %08X\n", acpi_gbl_fn_entry_str, integer);
+        acpi_ut_debug_print (ACPI_LV_FUNCTIONS,
+                line_number, function_name, module_name, component_id,
+                "%s %08X\n", acpi_gbl_fn_entry_str, integer);
 }
 
 
@@ -361,10 +371,9 @@ acpi_ut_trace_u32 (
  * FUNCTION:    acpi_ut_exit
  *
  * PARAMETERS:  line_number         - Caller's line number
- *              dbg_info            - Contains:
- *                  proc_name           - Caller's procedure name
- *                  module_name         - Caller's module name
- *                  component_id        - Caller's component ID
+ *              function_name       - Caller's procedure name
+ *              module_name         - Caller's module name
+ *              component_id        - Caller's component ID
  *
  * RETURN:      None
  *
@@ -376,11 +385,14 @@ acpi_ut_trace_u32 (
 void
 acpi_ut_exit (
         u32                             line_number,
-        struct acpi_debug_print_info    *dbg_info)
+        char                            *function_name,
+        char                            *module_name,
+        u32                             component_id)
 {
 
-        acpi_ut_debug_print (ACPI_LV_FUNCTIONS, line_number, dbg_info,
-                        "%s\n", acpi_gbl_fn_exit_str);
+        acpi_ut_debug_print (ACPI_LV_FUNCTIONS,
+                line_number, function_name, module_name, component_id,
+                "%s\n", acpi_gbl_fn_exit_str);
 
         acpi_gbl_nesting_level--;
 }
@@ -392,10 +404,9 @@ EXPORT_SYMBOL(acpi_ut_exit);
  * FUNCTION:    acpi_ut_status_exit
  *
  * PARAMETERS:  line_number         - Caller's line number
- *              dbg_info            - Contains:
- *                  proc_name           - Caller's procedure name
- *                  module_name         - Caller's module name
- *                  component_id        - Caller's component ID
+ *              function_name       - Caller's procedure name
+ *              module_name         - Caller's module name
+ *              component_id        - Caller's component ID
  *              Status              - Exit status code
  *
  * RETURN:      None
@@ -408,19 +419,23 @@ EXPORT_SYMBOL(acpi_ut_exit);
 void
 acpi_ut_status_exit (
         u32                             line_number,
-        struct acpi_debug_print_info    *dbg_info,
+        char                            *function_name,
+        char                            *module_name,
+        u32                             component_id,
         acpi_status                     status)
 {
 
         if (ACPI_SUCCESS (status)) {
-                acpi_ut_debug_print (ACPI_LV_FUNCTIONS, line_number, dbg_info,
-                                "%s %s\n", acpi_gbl_fn_exit_str,
-                                acpi_format_exception (status));
+                acpi_ut_debug_print (ACPI_LV_FUNCTIONS,
+                        line_number, function_name, module_name, component_id,
+                        "%s %s\n", acpi_gbl_fn_exit_str,
+                        acpi_format_exception (status));
         }
         else {
-                acpi_ut_debug_print (ACPI_LV_FUNCTIONS, line_number, dbg_info,
-                                "%s ****Exception****: %s\n", acpi_gbl_fn_exit_str,
-                                acpi_format_exception (status));
+                acpi_ut_debug_print (ACPI_LV_FUNCTIONS,
+                        line_number, function_name, module_name, component_id,
+                        "%s ****Exception****: %s\n", acpi_gbl_fn_exit_str,
+                        acpi_format_exception (status));
         }
 
         acpi_gbl_nesting_level--;
@@ -433,10 +448,9 @@ EXPORT_SYMBOL(acpi_ut_status_exit);
  * FUNCTION:    acpi_ut_value_exit
  *
  * PARAMETERS:  line_number         - Caller's line number
- *              dbg_info            - Contains:
- *                  proc_name           - Caller's procedure name
- *                  module_name         - Caller's module name
- *                  component_id        - Caller's component ID
+ *              function_name       - Caller's procedure name
+ *              module_name         - Caller's module name
+ *              component_id        - Caller's component ID
  *              Value               - Value to be printed with exit msg
  *
  * RETURN:      None
@@ -449,13 +463,16 @@ EXPORT_SYMBOL(acpi_ut_status_exit);
 void
 acpi_ut_value_exit (
         u32                             line_number,
-        struct acpi_debug_print_info    *dbg_info,
+        char                            *function_name,
+        char                            *module_name,
+        u32                             component_id,
         acpi_integer                    value)
 {
 
-        acpi_ut_debug_print (ACPI_LV_FUNCTIONS, line_number, dbg_info,
-                        "%s %8.8X%8.8X\n", acpi_gbl_fn_exit_str,
-                        ACPI_FORMAT_UINT64 (value));
+        acpi_ut_debug_print (ACPI_LV_FUNCTIONS,
+                line_number, function_name, module_name, component_id,
+                "%s %8.8X%8.8X\n", acpi_gbl_fn_exit_str,
+                ACPI_FORMAT_UINT64 (value));
 
         acpi_gbl_nesting_level--;
 }
@@ -467,10 +484,9 @@ EXPORT_SYMBOL(acpi_ut_value_exit);
  * FUNCTION:    acpi_ut_ptr_exit
  *
  * PARAMETERS:  line_number         - Caller's line number
- *              dbg_info            - Contains:
- *                  proc_name           - Caller's procedure name
- *                  module_name         - Caller's module name
- *                  component_id        - Caller's component ID
+ *              function_name       - Caller's procedure name
+ *              module_name         - Caller's module name
+ *              component_id        - Caller's component ID
  *              Ptr                 - Pointer to display
  *
  * RETURN:      None
@@ -483,12 +499,15 @@ EXPORT_SYMBOL(acpi_ut_value_exit);
 void
 acpi_ut_ptr_exit (
         u32                             line_number,
-        struct acpi_debug_print_info    *dbg_info,
+        char                            *function_name,
+        char                            *module_name,
+        u32                             component_id,
         u8                              *ptr)
 {
 
-        acpi_ut_debug_print (ACPI_LV_FUNCTIONS, line_number, dbg_info,
-                        "%s %p\n", acpi_gbl_fn_exit_str, ptr);
+        acpi_ut_debug_print (ACPI_LV_FUNCTIONS,
+                line_number, function_name, module_name, component_id,
+                "%s %p\n", acpi_gbl_fn_exit_str, ptr);
 
         acpi_gbl_nesting_level--;
 }
diff --git a/drivers/acpi/utilities/utdelete.c b/drivers/acpi/utilities/utdelete.c
index be97ada23c3d..eeafb324c504 100644
--- a/drivers/acpi/utilities/utdelete.c
+++ b/drivers/acpi/utilities/utdelete.c
@@ -435,35 +435,24 @@ acpi_ut_update_object_reference (
         union acpi_operand_object       *object,
         u16                             action)
 {
-        acpi_status                     status;
-        u32                             i;
-        union acpi_generic_state         *state_list = NULL;
-        union acpi_generic_state         *state;
+        acpi_status                     status = AE_OK;
+        union acpi_generic_state        *state_list = NULL;
+        union acpi_operand_object       *next_object = NULL;
+        union acpi_generic_state        *state;
+        acpi_native_uint                i;
 
 
         ACPI_FUNCTION_TRACE_PTR ("ut_update_object_reference", object);
 
 
-        /* Ignore a null object ptr */
+        while (object) {
+                /* Make sure that this isn't a namespace handle */
 
-        if (!object) {
-                return_ACPI_STATUS (AE_OK);
-        }
-
-        /* Make sure that this isn't a namespace handle */
-
-        if (ACPI_GET_DESCRIPTOR_TYPE (object) == ACPI_DESC_TYPE_NAMED) {
-                ACPI_DEBUG_PRINT ((ACPI_DB_ALLOCATIONS,
-                        "Object %p is NS handle\n", object));
-                return_ACPI_STATUS (AE_OK);
-        }
-
-        state = acpi_ut_create_update_state (object, action);
-
-        while (state) {
-                object = state->update.object;
-                action = state->update.value;
-                acpi_ut_delete_generic_state (state);
+                if (ACPI_GET_DESCRIPTOR_TYPE (object) == ACPI_DESC_TYPE_NAMED) {
+                        ACPI_DEBUG_PRINT ((ACPI_DB_ALLOCATIONS,
+                                "Object %p is NS handle\n", object));
+                        return_ACPI_STATUS (AE_OK);
+                }
 
                 /*
                  * All sub-objects must have their reference count incremented also.
@@ -476,12 +465,10 @@ acpi_ut_update_object_reference (
                         acpi_ut_update_ref_count (object->device.device_notify, action);
                         break;
 
-
                 case ACPI_TYPE_PACKAGE:
-
                         /*
-                         * We must update all the sub-objects of the package
-                         * (Each of whom may have their own sub-objects, etc.
+                         * We must update all the sub-objects of the package,
+                         * each of whom may have their own sub-objects.
                          */
                         for (i = 0; i < object->package.count; i++) {
                                 /*
@@ -497,35 +484,19 @@ acpi_ut_update_object_reference (
                         }
                         break;
 
-
                 case ACPI_TYPE_BUFFER_FIELD:
 
-                        status = acpi_ut_create_update_state_and_push (
-                                         object->buffer_field.buffer_obj, action, &state_list);
-                        if (ACPI_FAILURE (status)) {
-                                goto error_exit;
-                        }
+                        next_object = object->buffer_field.buffer_obj;
                         break;
 
-
                 case ACPI_TYPE_LOCAL_REGION_FIELD:
 
-                        status = acpi_ut_create_update_state_and_push (
-                                         object->field.region_obj, action, &state_list);
-                        if (ACPI_FAILURE (status)) {
-                                goto error_exit;
-                        }
-                   break;
-
+                        next_object = object->field.region_obj;
+                        break;
 
                 case ACPI_TYPE_LOCAL_BANK_FIELD:
 
-                        status = acpi_ut_create_update_state_and_push (
-                                         object->bank_field.bank_obj, action, &state_list);
-                        if (ACPI_FAILURE (status)) {
-                                goto error_exit;
-                        }
-
+                        next_object = object->bank_field.bank_obj;
                         status = acpi_ut_create_update_state_and_push (
                                          object->bank_field.region_obj, action, &state_list);
                         if (ACPI_FAILURE (status)) {
@@ -533,15 +504,9 @@ acpi_ut_update_object_reference (
                         }
                         break;
 
-
                 case ACPI_TYPE_LOCAL_INDEX_FIELD:
 
-                        status = acpi_ut_create_update_state_and_push (
-                                         object->index_field.index_obj, action, &state_list);
-                        if (ACPI_FAILURE (status)) {
-                                goto error_exit;
-                        }
-
+                        next_object = object->index_field.index_obj;
                         status = acpi_ut_create_update_state_and_push (
                                          object->index_field.data_obj, action, &state_list);
                         if (ACPI_FAILURE (status)) {
@@ -549,28 +514,19 @@ acpi_ut_update_object_reference (
                         }
                         break;
 
-
                 case ACPI_TYPE_LOCAL_REFERENCE:
-
                         /*
                          * The target of an Index (a package, string, or buffer) must track
                          * changes to the ref count of the index.
                          */
                         if (object->reference.opcode == AML_INDEX_OP) {
-                                status = acpi_ut_create_update_state_and_push (
-                                                 object->reference.object, action, &state_list);
-                                if (ACPI_FAILURE (status)) {
-                                        goto error_exit;
-                                }
+                                next_object = object->reference.object;
                         }
                         break;
 
-
                 case ACPI_TYPE_REGION:
                 default:
-
-                        /* No subobjects */
-                        break;
+                        break;/* No subobjects */
                 }
 
                 /*
@@ -579,15 +535,23 @@ acpi_ut_update_object_reference (
                  * main object to be deleted.
                  */
                 acpi_ut_update_ref_count (object, action);
+                object = NULL;
 
                 /* Move on to the next object to be updated */
 
-                state = acpi_ut_pop_generic_state (&state_list);
+                if (next_object) {
+                        object = next_object;
+                        next_object = NULL;
+                }
+                else if (state_list) {
+                        state = acpi_ut_pop_generic_state (&state_list);
+                        object = state->update.object;
+                        acpi_ut_delete_generic_state (state);
+                }
         }
 
         return_ACPI_STATUS (AE_OK);
 
-
 error_exit:
 
         ACPI_REPORT_ERROR (("Could not update object reference count, %s\n",
diff --git a/drivers/acpi/utilities/utglobal.c b/drivers/acpi/utilities/utglobal.c
index 8653dda4f813..0e4161c81076 100644
--- a/drivers/acpi/utilities/utglobal.c
+++ b/drivers/acpi/utilities/utglobal.c
@@ -738,73 +738,6 @@ acpi_ut_valid_object_type (
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_ut_allocate_owner_id
- *
- * PARAMETERS:  id_type         - Type of ID (method or table)
- *
- * DESCRIPTION: Allocate a table or method owner id
- *
- * NOTE: this algorithm has a wraparound problem at 64_k method invocations, and
- *       should be revisited (TBD)
- *
- ******************************************************************************/
-
-acpi_owner_id
-acpi_ut_allocate_owner_id (
-        u32                             id_type)
-{
-        acpi_owner_id                   owner_id = 0xFFFF;
-
-
-        ACPI_FUNCTION_TRACE ("ut_allocate_owner_id");
-
-
-        if (ACPI_FAILURE (acpi_ut_acquire_mutex (ACPI_MTX_CACHES)))
-        {
-                return (0);
-        }
-
-        switch (id_type)
-        {
-        case ACPI_OWNER_TYPE_TABLE:
-
-                owner_id = acpi_gbl_next_table_owner_id;
-                acpi_gbl_next_table_owner_id++;
-
-                /* Check for wraparound */
-
-                if (acpi_gbl_next_table_owner_id == ACPI_FIRST_METHOD_ID)
-                {
-                        acpi_gbl_next_table_owner_id = ACPI_FIRST_TABLE_ID;
-                        ACPI_REPORT_WARNING (("Table owner ID wraparound\n"));
-                }
-                break;
-
-
-        case ACPI_OWNER_TYPE_METHOD:
-
-                owner_id = acpi_gbl_next_method_owner_id;
-                acpi_gbl_next_method_owner_id++;
-
-                if (acpi_gbl_next_method_owner_id == ACPI_FIRST_TABLE_ID)
-                {
-                        /* Check for wraparound */
-
-                        acpi_gbl_next_method_owner_id = ACPI_FIRST_METHOD_ID;
-                }
-                break;
-
-        default:
-                break;
-        }
-
-        (void) acpi_ut_release_mutex (ACPI_MTX_CACHES);
-        return_VALUE (owner_id);
-}
-
-
-/*******************************************************************************
- *
  * FUNCTION:    acpi_ut_init_globals
  *
  * PARAMETERS:  None
@@ -848,7 +781,7 @@ acpi_ut_init_globals (
         for (i = 0; i < NUM_MUTEX; i++)
         {
                 acpi_gbl_mutex_info[i].mutex        = NULL;
-                acpi_gbl_mutex_info[i].owner_id     = ACPI_MUTEX_NOT_ACQUIRED;
+                acpi_gbl_mutex_info[i].thread_id    = ACPI_MUTEX_NOT_ACQUIRED;
                 acpi_gbl_mutex_info[i].use_count    = 0;
         }
 
@@ -889,8 +822,7 @@ acpi_ut_init_globals (
         acpi_gbl_ns_lookup_count            = 0;
         acpi_gbl_ps_find_count              = 0;
         acpi_gbl_acpi_hardware_present      = TRUE;
-        acpi_gbl_next_table_owner_id        = ACPI_FIRST_TABLE_ID;
-        acpi_gbl_next_method_owner_id       = ACPI_FIRST_METHOD_ID;
+        acpi_gbl_owner_id_mask              = 0;
         acpi_gbl_debugger_configuration     = DEBUGGER_THREADING;
         acpi_gbl_db_output_flags            = ACPI_DB_CONSOLE_OUTPUT;
 
diff --git a/drivers/acpi/utilities/utmisc.c b/drivers/acpi/utilities/utmisc.c
index 207c836aec64..df715cd89105 100644
--- a/drivers/acpi/utilities/utmisc.c
+++ b/drivers/acpi/utilities/utmisc.c
@@ -52,6 +52,100 @@
 
 /*******************************************************************************
  *
+ * FUNCTION:    acpi_ut_allocate_owner_id
+ *
+ * PARAMETERS:  owner_id        - Where the new owner ID is returned
+ *
+ * DESCRIPTION: Allocate a table or method owner id
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_ut_allocate_owner_id (
+        acpi_owner_id                   *owner_id)
+{
+        acpi_native_uint                i;
+        acpi_status                     status;
+
+
+        ACPI_FUNCTION_TRACE ("ut_allocate_owner_id");
+
+
+        status = acpi_ut_acquire_mutex (ACPI_MTX_CACHES);
+        if (ACPI_FAILURE (status)) {
+                return_ACPI_STATUS (status);
+        }
+
+        /* Find a free owner ID */
+
+        for (i = 0; i < 32; i++) {
+                if (!(acpi_gbl_owner_id_mask & (1 << i))) {
+                        acpi_gbl_owner_id_mask |= (1 << i);
+                        *owner_id = (acpi_owner_id) i;
+                        goto exit;
+                }
+        }
+
+        /*
+         * If we are here, all owner_ids have been allocated. This probably should
+         * not happen since the IDs are reused after deallocation. The IDs are
+         * allocated upon table load (one per table) and method execution, and
+         * they are released when a table is unloaded or a method completes
+         * execution.
+         */
+        status = AE_OWNER_ID_LIMIT;
+        ACPI_REPORT_ERROR ((
+                "Could not allocate new owner_id (32 max), AE_OWNER_ID_LIMIT\n"));
+
+exit:
+        (void) acpi_ut_release_mutex (ACPI_MTX_CACHES);
+        return_ACPI_STATUS (status);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_release_owner_id
+ *
+ * PARAMETERS:  owner_id        - A previously allocated owner ID
+ *
+ * DESCRIPTION: Release a table or method owner id
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_ut_release_owner_id (
+        acpi_owner_id                   owner_id)
+{
+        acpi_status                     status;
+
+
+        ACPI_FUNCTION_TRACE ("ut_release_owner_id");
+
+
+        status = acpi_ut_acquire_mutex (ACPI_MTX_CACHES);
+        if (ACPI_FAILURE (status)) {
+                return_ACPI_STATUS (status);
+        }
+
+        /* Free the owner ID */
+
+        if (acpi_gbl_owner_id_mask & (1 << owner_id)) {
+                acpi_gbl_owner_id_mask ^= (1 << owner_id);
+        }
+        else {
+                /* This owner_id has not been allocated */
+
+                status = AE_NOT_EXIST;
+        }
+
+        (void) acpi_ut_release_mutex (ACPI_MTX_CACHES);
+        return_ACPI_STATUS (status);
+}
+
+
+/*******************************************************************************
+ *
  * FUNCTION:    acpi_ut_strupr (strupr)
  *
  * PARAMETERS:  src_string      - The source string to convert
diff --git a/drivers/acpi/utilities/utmutex.c b/drivers/acpi/utilities/utmutex.c
index a80b97cb2e56..0699b6be62b6 100644
--- a/drivers/acpi/utilities/utmutex.c
+++ b/drivers/acpi/utilities/utmutex.c
@@ -159,7 +159,7 @@ acpi_ut_create_mutex (
         if (!acpi_gbl_mutex_info[mutex_id].mutex) {
                 status = acpi_os_create_semaphore (1, 1,
                                   &acpi_gbl_mutex_info[mutex_id].mutex);
-                acpi_gbl_mutex_info[mutex_id].owner_id = ACPI_MUTEX_NOT_ACQUIRED;
+                acpi_gbl_mutex_info[mutex_id].thread_id = ACPI_MUTEX_NOT_ACQUIRED;
                 acpi_gbl_mutex_info[mutex_id].use_count = 0;
         }
 
@@ -196,7 +196,7 @@ acpi_ut_delete_mutex (
         status = acpi_os_delete_semaphore (acpi_gbl_mutex_info[mutex_id].mutex);
 
         acpi_gbl_mutex_info[mutex_id].mutex = NULL;
-        acpi_gbl_mutex_info[mutex_id].owner_id = ACPI_MUTEX_NOT_ACQUIRED;
+        acpi_gbl_mutex_info[mutex_id].thread_id = ACPI_MUTEX_NOT_ACQUIRED;
 
         return_ACPI_STATUS (status);
 }
@@ -274,7 +274,7 @@ acpi_ut_acquire_mutex (
                         this_thread_id, acpi_ut_get_mutex_name (mutex_id)));
 
                 acpi_gbl_mutex_info[mutex_id].use_count++;
-                acpi_gbl_mutex_info[mutex_id].owner_id = this_thread_id;
+                acpi_gbl_mutex_info[mutex_id].thread_id = this_thread_id;
         }
         else {
                 ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
@@ -322,7 +322,7 @@ acpi_ut_release_mutex (
         /*
          * Mutex must be acquired in order to release it!
          */
-        if (acpi_gbl_mutex_info[mutex_id].owner_id == ACPI_MUTEX_NOT_ACQUIRED) {
+        if (acpi_gbl_mutex_info[mutex_id].thread_id == ACPI_MUTEX_NOT_ACQUIRED) {
                 ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
                         "Mutex [%s] is not acquired, cannot release\n",
                         acpi_ut_get_mutex_name (mutex_id)));
@@ -359,7 +359,7 @@ acpi_ut_release_mutex (
 
         /* Mark unlocked FIRST */
 
-        acpi_gbl_mutex_info[mutex_id].owner_id = ACPI_MUTEX_NOT_ACQUIRED;
+        acpi_gbl_mutex_info[mutex_id].thread_id = ACPI_MUTEX_NOT_ACQUIRED;
 
         status = acpi_os_signal_semaphore (acpi_gbl_mutex_info[mutex_id].mutex, 1);