1 files changed, 14 insertions, 2 deletions
diff --git a/source/components/utilities/utinit.c b/source/components/utilities/utinit.c
index 8f8eaaad92b9..9689abb43516 100644
--- a/source/components/utilities/utinit.c
+++ b/source/components/utilities/utinit.c
@@ -262,8 +262,6 @@ AcpiUtInitGlobals (
     AcpiGbl_DisableMemTracking          = FALSE;
 #endif
 
-    ACPI_DEBUGGER_EXEC (AcpiGbl_DbTerminateThreads = FALSE);
-
     return_ACPI_STATUS (AE_OK);
 }
 
@@ -312,6 +310,20 @@ AcpiUtSubsystemShutdown (
     ACPI_FUNCTION_TRACE (UtSubsystemShutdown);
 
 
+    /* Just exit if subsystem is already shutdown */
+
+    if (AcpiGbl_Shutdown)
+    {
+        ACPI_ERROR ((AE_INFO, "ACPI Subsystem is already terminated"));
+        return_VOID;
+    }
+
+    /* Subsystem appears active, go ahead and shut it down */
+
+    AcpiGbl_Shutdown = TRUE;
+    AcpiGbl_StartupFlags = 0;
+    ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Shutting down ACPI Subsystem\n"));
+
 #ifndef ACPI_ASL_COMPILER
 
     /* Close the AcpiEvent Handling */