3 files changed, 9 insertions, 6 deletions

diff --git a/drivers/acpi/utilities/utalloc.c b/drivers/acpi/utilities/utalloc.c
index 068450b36475..dc7f24b3a1c0 100644
--- a/drivers/acpi/utilities/utalloc.c
+++ b/drivers/acpi/utilities/utalloc.c
@@ -304,7 +304,7 @@ void *acpi_ut_allocate(acpi_size size, u32 component, char *module, u32 line)
 
         if (!size) {
                 _ACPI_REPORT_ERROR(module, line, component,
-                                   ("ut_allocate: Attempt to allocate zero bytes\n"));
+                                   ("ut_allocate: Attempt to allocate zero bytes, allocating 1 byte\n"));
                 size = 1;
         }
 
@@ -347,8 +347,8 @@ void *acpi_ut_callocate(acpi_size size, u32 component, char *module, u32 line)
 
         if (!size) {
                 _ACPI_REPORT_ERROR(module, line, component,
-                                   ("ut_callocate: Attempt to allocate zero bytes\n"));
-                return_PTR(NULL);
+                                   ("ut_callocate: Attempt to allocate zero bytes, allocating 1 byte\n"));
+                size = 1;
         }
 
         allocation = acpi_os_allocate(size);
diff --git a/drivers/acpi/utilities/utglobal.c b/drivers/acpi/utilities/utglobal.c
index 399e64b51886..7f72839841ca 100644
--- a/drivers/acpi/utilities/utglobal.c
+++ b/drivers/acpi/utilities/utglobal.c
@@ -825,6 +825,9 @@ void acpi_ut_init_globals(void)
         acpi_gbl_ps_find_count = 0;
         acpi_gbl_acpi_hardware_present = TRUE;
         acpi_gbl_owner_id_mask = 0;
+        acpi_gbl_trace_method_name = 0;
+        acpi_gbl_trace_dbg_level = 0;
+        acpi_gbl_trace_dbg_layer = 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 aa1dcd851f89..b57afa7421e8 100644
--- a/drivers/acpi/utilities/utmisc.c
+++ b/drivers/acpi/utilities/utmisc.c
@@ -811,15 +811,15 @@ u8 *acpi_ut_get_resource_end_tag(union acpi_operand_object * obj_desc)
 
         while (buffer < end_buffer) {
                 buffer_byte = *buffer;
-                if (buffer_byte & ACPI_RDESC_TYPE_LARGE) {
+                if (buffer_byte & ACPI_RESOURCE_NAME_LARGE) {
                         /* Large Descriptor - Length is next 2 bytes */
 
                         buffer += ((*(buffer + 1) | (*(buffer + 2) << 8)) + 3);
                 } else {
                         /* Small Descriptor.  End Tag will be found here */
 
-                        if ((buffer_byte & ACPI_RDESC_SMALL_MASK) ==
-                            ACPI_RDESC_TYPE_END_TAG) {
+                        if ((buffer_byte & ACPI_RESOURCE_NAME_SMALL_MASK) ==
+                            ACPI_RESOURCE_NAME_END_TAG) {
                                 /* Found the end tag descriptor, all done. */
 
                                 return (buffer);