2 files changed, 9 insertions, 8 deletions
diff --git a/source/components/utilities/utclib.c b/source/components/utilities/utclib.c
index 6e3e9b4eb5b2..a93ed867a4d8 100644
--- a/source/components/utilities/utclib.c
+++ b/source/components/utilities/utclib.c
@@ -64,7 +64,6 @@
  * instead of the functions in this module.
  */
 
-
 /*******************************************************************************
  *
  * Functions implemented in this module:
@@ -88,7 +87,6 @@
  *
  ******************************************************************************/
 
-
 #define _COMPONENT          ACPI_UTILITIES
         ACPI_MODULE_NAME    ("utclib")
 
@@ -772,13 +770,13 @@ tolower (
 
 /*******************************************************************************
  *
- * FUNCTION:    is* functions
+ * FUNCTION:    is* function array
  *
  * DESCRIPTION: is* functions use the ctype table below
  *
  ******************************************************************************/
 
-const UINT8 _acpi_ctype[257] = {
+const UINT8 AcpiGbl_Ctypes[257] = {
     _ACPI_CN,            /* 0x00     0 NUL */
     _ACPI_CN,            /* 0x01     1 SOH */
     _ACPI_CN,            /* 0x02     2 STX */
diff --git a/source/components/utilities/utxfinit.c b/source/components/utilities/utxfinit.c
index cd43870b6ee9..701b171f68e2 100644
--- a/source/components/utilities/utxfinit.c
+++ b/source/components/utilities/utxfinit.c
@@ -194,11 +194,14 @@ AcpiEnableSubsystem (
      * Obtain a permanent mapping for the FACS. This is required for the
      * Global Lock and the Firmware Waking Vector
      */
-    Status = AcpiTbInitializeFacs ();
-    if (ACPI_FAILURE (Status))
+    if (!(Flags & ACPI_NO_FACS_INIT))
     {
-        ACPI_WARNING ((AE_INFO, "Could not map the FACS table"));
-        return_ACPI_STATUS (Status);
+        Status = AcpiTbInitializeFacs ();
+        if (ACPI_FAILURE (Status))
+        {
+            ACPI_WARNING ((AE_INFO, "Could not map the FACS table"));
+            return_ACPI_STATUS (Status);
+        }
     }
 
 #endif /* !ACPI_REDUCED_HARDWARE */