2 files changed, 7 insertions, 3 deletions

diff --git a/drivers/acpi/utilities/utdebug.c b/drivers/acpi/utilities/utdebug.c
index 081a778aba88..d80e92639932 100644
--- a/drivers/acpi/utilities/utdebug.c
+++ b/drivers/acpi/utilities/utdebug.c
@@ -122,13 +122,13 @@ static const char *acpi_ut_trim_function_name(const char *function_name)
 
         /* All Function names are longer than 4 chars, check is safe */
 
-        if (*(ACPI_CAST_PTR(u32, function_name)) == ACPI_FUNCTION_PREFIX1) {
+        if (*(ACPI_CAST_PTR(u32, function_name)) == ACPI_PREFIX_MIXED) {
                 /* This is the case where the original source has not been modified */
 
                 return (function_name + 4);
         }
 
-        if (*(ACPI_CAST_PTR(u32, function_name)) == ACPI_FUNCTION_PREFIX2) {
+        if (*(ACPI_CAST_PTR(u32, function_name)) == ACPI_PREFIX_LOWER) {
                 /* This is the case where the source has been 'linuxized' */
 
                 return (function_name + 5);
diff --git a/drivers/acpi/utilities/utmisc.c b/drivers/acpi/utilities/utmisc.c
index 474fe7cb6c09..f0275025b718 100644
--- a/drivers/acpi/utilities/utmisc.c
+++ b/drivers/acpi/utilities/utmisc.c
@@ -78,6 +78,10 @@ acpi_status acpi_ut_allocate_owner_id(acpi_owner_id * owner_id)
 
         for (i = 0; i < 32; i++) {
                 if (!(acpi_gbl_owner_id_mask & (1 << i))) {
+                        ACPI_DEBUG_PRINT((ACPI_DB_VALUES,
+                                          "Current owner_id mask: %8.8X New ID: %2.2X\n",
+                                          acpi_gbl_owner_id_mask, (i + 1)));
+
                         acpi_gbl_owner_id_mask |= (1 << i);
                         *owner_id = (acpi_owner_id) (i + 1);
                         goto exit;
@@ -119,7 +123,7 @@ void acpi_ut_release_owner_id(acpi_owner_id * owner_id_ptr)
         acpi_owner_id owner_id = *owner_id_ptr;
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("ut_release_owner_id");
+        ACPI_FUNCTION_TRACE_U32("ut_release_owner_id", owner_id);
 
         /* Always clear the input owner_id (zero is an invalid ID) */