1 files changed, 47 insertions, 152 deletions

diff --git a/drivers/acpi/utilities/utglobal.c b/drivers/acpi/utilities/utglobal.c
index 014030af8b50..af33358a964b 100644
--- a/drivers/acpi/utilities/utglobal.c
+++ b/drivers/acpi/utilities/utglobal.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -46,89 +46,9 @@
 #include <acpi/acpi.h>
 #include <acpi/acnamesp.h>
 
+ACPI_EXPORT_SYMBOL(acpi_gbl_FADT)
 #define _COMPONENT          ACPI_UTILITIES
-ACPI_MODULE_NAME("utglobal")
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_format_exception
- *
- * PARAMETERS:  Status       - The acpi_status code to be formatted
- *
- * RETURN:      A string containing the exception text. A valid pointer is
- *              always returned.
- *
- * DESCRIPTION: This function translates an ACPI exception into an ASCII string.
- *
- ******************************************************************************/
-const char *acpi_format_exception(acpi_status status)
-{
-        acpi_status sub_status;
-        const char *exception = NULL;
-
-        ACPI_FUNCTION_ENTRY();
-
-        /*
-         * Status is composed of two parts, a "type" and an actual code
-         */
-        sub_status = (status & ~AE_CODE_MASK);
-
-        switch (status & AE_CODE_MASK) {
-        case AE_CODE_ENVIRONMENTAL:
-
-                if (sub_status <= AE_CODE_ENV_MAX) {
-                        exception = acpi_gbl_exception_names_env[sub_status];
-                }
-                break;
-
-        case AE_CODE_PROGRAMMER:
-
-                if (sub_status <= AE_CODE_PGM_MAX) {
-                        exception =
-                            acpi_gbl_exception_names_pgm[sub_status - 1];
-                }
-                break;
-
-        case AE_CODE_ACPI_TABLES:
-
-                if (sub_status <= AE_CODE_TBL_MAX) {
-                        exception =
-                            acpi_gbl_exception_names_tbl[sub_status - 1];
-                }
-                break;
-
-        case AE_CODE_AML:
-
-                if (sub_status <= AE_CODE_AML_MAX) {
-                        exception =
-                            acpi_gbl_exception_names_aml[sub_status - 1];
-                }
-                break;
-
-        case AE_CODE_CONTROL:
-
-                if (sub_status <= AE_CODE_CTRL_MAX) {
-                        exception =
-                            acpi_gbl_exception_names_ctrl[sub_status - 1];
-                }
-                break;
-
-        default:
-                break;
-        }
-
-        if (!exception) {
-
-                /* Exception code was not recognized */
-
-                ACPI_ERROR((AE_INFO,
-                            "Unknown exception code: 0x%8.8X", status));
-
-                exception = "UNKNOWN_STATUS_CODE";
-        }
-
-        return (ACPI_CAST_PTR(const char, exception));
-}
+    ACPI_MODULE_NAME("utglobal")
 
 /*******************************************************************************
  *
@@ -163,8 +83,6 @@ u32 acpi_gbl_startup_flags = 0;
 
 u8 acpi_gbl_shutdown = TRUE;
 
-const u8 acpi_gbl_decode_to8bit[8] = { 1, 2, 4, 8, 16, 32, 64, 128 };
-
 const char *acpi_gbl_sleep_state_names[ACPI_S_STATE_COUNT] = {
         "\\_S0_",
         "\\_S1_",
@@ -183,10 +101,45 @@ const char *acpi_gbl_highest_dstate_names[4] = {
 
 /*******************************************************************************
  *
- * Namespace globals
+ * FUNCTION:    acpi_format_exception
+ *
+ * PARAMETERS:  Status       - The acpi_status code to be formatted
+ *
+ * RETURN:      A string containing the exception text. A valid pointer is
+ *              always returned.
+ *
+ * DESCRIPTION: This function translates an ACPI exception into an ASCII string
+ *              It is here instead of utxface.c so it is always present.
  *
  ******************************************************************************/
 
+const char *acpi_format_exception(acpi_status status)
+{
+        const char *exception = NULL;
+
+        ACPI_FUNCTION_ENTRY();
+
+        exception = acpi_ut_validate_exception(status);
+        if (!exception) {
+
+                /* Exception code was not recognized */
+
+                ACPI_ERROR((AE_INFO,
+                            "Unknown exception code: 0x%8.8X", status));
+
+                exception = "UNKNOWN_STATUS_CODE";
+        }
+
+        return (ACPI_CAST_PTR(const char, exception));
+}
+
+ACPI_EXPORT_SYMBOL(acpi_format_exception)
+
+/*******************************************************************************
+ *
+ * Namespace globals
+ *
+ ******************************************************************************/
 /*
  * Predefined ACPI Names (Built-in to the Interpreter)
  *
@@ -280,53 +233,6 @@ char acpi_ut_hex_to_ascii_char(acpi_integer integer, u32 position)
         return (acpi_gbl_hex_to_ascii[(integer >> position) & 0xF]);
 }
 
-/*******************************************************************************
- *
- * Table name globals
- *
- * NOTE: This table includes ONLY the ACPI tables that the subsystem consumes.
- * it is NOT an exhaustive list of all possible ACPI tables.  All ACPI tables
- * that are not used by the subsystem are simply ignored.
- *
- * Do NOT add any table to this list that is not consumed directly by this
- * subsystem (No MADT, ECDT, SBST, etc.)
- *
- ******************************************************************************/
-
-struct acpi_table_list acpi_gbl_table_lists[ACPI_TABLE_ID_MAX + 1];
-
-struct acpi_table_support acpi_gbl_table_data[ACPI_TABLE_ID_MAX + 1] = {
-        /***********    Name,   Signature, Global typed pointer     Signature size,      Type                  How many allowed?,    Contains valid AML? */
-
-        /* RSDP 0 */ {RSDP_NAME, RSDP_SIG, NULL, sizeof(RSDP_SIG) - 1,
-                      ACPI_TABLE_ROOT | ACPI_TABLE_SINGLE}
-        ,
-        /* DSDT 1 */ {DSDT_SIG, DSDT_SIG, (void *)&acpi_gbl_DSDT,
-                      sizeof(DSDT_SIG) - 1,
-                      ACPI_TABLE_SECONDARY | ACPI_TABLE_SINGLE |
-                      ACPI_TABLE_EXECUTABLE}
-        ,
-        /* FADT 2 */ {FADT_SIG, FADT_SIG, (void *)&acpi_gbl_FADT,
-                      sizeof(FADT_SIG) - 1,
-                      ACPI_TABLE_PRIMARY | ACPI_TABLE_SINGLE}
-        ,
-        /* FACS 3 */ {FACS_SIG, FACS_SIG, (void *)&acpi_gbl_FACS,
-                      sizeof(FACS_SIG) - 1,
-                      ACPI_TABLE_SECONDARY | ACPI_TABLE_SINGLE}
-        ,
-        /* PSDT 4 */ {PSDT_SIG, PSDT_SIG, NULL, sizeof(PSDT_SIG) - 1,
-                      ACPI_TABLE_PRIMARY | ACPI_TABLE_MULTIPLE |
-                      ACPI_TABLE_EXECUTABLE}
-        ,
-        /* SSDT 5 */ {SSDT_SIG, SSDT_SIG, NULL, sizeof(SSDT_SIG) - 1,
-                      ACPI_TABLE_PRIMARY | ACPI_TABLE_MULTIPLE |
-                      ACPI_TABLE_EXECUTABLE}
-        ,
-        /* XSDT 6 */ {XSDT_SIG, XSDT_SIG, NULL, sizeof(RSDT_SIG) - 1,
-                      ACPI_TABLE_ROOT | ACPI_TABLE_SINGLE}
-        ,
-};
-
 /******************************************************************************
  *
  * Event and Hardware globals
@@ -612,7 +518,7 @@ char *acpi_ut_get_node_name(void *object)
         /* Name must be a valid ACPI name */
 
         if (!acpi_ut_valid_acpi_name(node->name.integer)) {
-                node->name.integer = acpi_ut_repair_name(node->name.integer);
+                node->name.integer = acpi_ut_repair_name(node->name.ascii);
         }
 
         /* Return the name */
@@ -751,13 +657,6 @@ void acpi_ut_init_globals(void)
                 return;
         }
 
-        /* ACPI table structure */
-
-        for (i = 0; i < (ACPI_TABLE_ID_MAX + 1); i++) {
-                acpi_gbl_table_lists[i].next = NULL;
-                acpi_gbl_table_lists[i].count = 0;
-        }
-
         /* Mutex locked flags */
 
         for (i = 0; i < ACPI_NUM_MUTEX; i++) {
@@ -773,6 +672,7 @@ void acpi_ut_init_globals(void)
 
         /* GPE support */
 
+        acpi_gpe_count = 0;
         acpi_gbl_gpe_xrupt_list_head = NULL;
         acpi_gbl_gpe_fadt_blocks[0] = NULL;
         acpi_gbl_gpe_fadt_blocks[1] = NULL;
@@ -784,25 +684,15 @@ void acpi_ut_init_globals(void)
         acpi_gbl_exception_handler = NULL;
         acpi_gbl_init_handler = NULL;
 
-        /* Global "typed" ACPI table pointers */
-
-        acpi_gbl_RSDP = NULL;
-        acpi_gbl_XSDT = NULL;
-        acpi_gbl_FACS = NULL;
-        acpi_gbl_FADT = NULL;
-        acpi_gbl_DSDT = NULL;
-
         /* Global Lock support */
 
         acpi_gbl_global_lock_semaphore = NULL;
+        acpi_gbl_global_lock_mutex = NULL;
         acpi_gbl_global_lock_acquired = FALSE;
-        acpi_gbl_global_lock_thread_count = 0;
         acpi_gbl_global_lock_handle = 0;
 
         /* Miscellaneous variables */
 
-        acpi_gbl_table_flags = ACPI_PHYSICAL_POINTER;
-        acpi_gbl_rsdp_original_location = 0;
         acpi_gbl_cm_single_step = FALSE;
         acpi_gbl_db_terminate_threads = FALSE;
         acpi_gbl_shutdown = FALSE;
@@ -837,8 +727,13 @@ void acpi_ut_init_globals(void)
         acpi_gbl_lowest_stack_pointer = ACPI_SIZE_MAX;
 #endif
 
+#ifdef ACPI_DBG_TRACK_ALLOCATIONS
+        acpi_gbl_display_final_mem_stats = FALSE;
+#endif
+
         return_VOID;
 }
 
 ACPI_EXPORT_SYMBOL(acpi_dbg_level)
 ACPI_EXPORT_SYMBOL(acpi_dbg_layer)
+ACPI_EXPORT_SYMBOL(acpi_gpe_count)