/home/lenb/src/to-akpm branch 'acpi-2.6.12'

1 files changed, 25 insertions, 9 deletions

diff --git a/drivers/acpi/tables/tbinstal.c b/drivers/acpi/tables/tbinstal.c
index 629b64c8193d..698799901f55 100644
--- a/drivers/acpi/tables/tbinstal.c
+++ b/drivers/acpi/tables/tbinstal.c
@@ -124,9 +124,7 @@ acpi_tb_match_signature (
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Load and validate all tables other than the RSDT.  The RSDT must
- *              already be loaded and validated.
- *              Install the table into the global data structs.
+ * DESCRIPTION: Install the table into the global data structures.
  *
  ******************************************************************************/
 
@@ -136,6 +134,7 @@ acpi_tb_install_table (
 {
         acpi_status                     status;
 
+
         ACPI_FUNCTION_TRACE ("tb_install_table");
 
 
@@ -143,22 +142,33 @@ acpi_tb_install_table (
 
         status = acpi_ut_acquire_mutex (ACPI_MTX_TABLES);
         if (ACPI_FAILURE (status)) {
-                ACPI_REPORT_ERROR (("Could not acquire table mutex for [%4.4s], %s\n",
-                        table_info->pointer->signature, acpi_format_exception (status)));
+                ACPI_REPORT_ERROR (("Could not acquire table mutex, %s\n",
+                        acpi_format_exception (status)));
                 return_ACPI_STATUS (status);
         }
 
+        /*
+         * Ignore a table that is already installed. For example, some BIOS
+         * ASL code will repeatedly attempt to load the same SSDT.
+         */
+        status = acpi_tb_is_table_installed (table_info);
+        if (ACPI_FAILURE (status)) {
+                goto unlock_and_exit;
+        }
+
         /* Install the table into the global data structure */
 
         status = acpi_tb_init_table_descriptor (table_info->type, table_info);
         if (ACPI_FAILURE (status)) {
-                ACPI_REPORT_ERROR (("Could not install ACPI table [%4.4s], %s\n",
+                ACPI_REPORT_ERROR (("Could not install table [%4.4s], %s\n",
                         table_info->pointer->signature, acpi_format_exception (status)));
         }
 
         ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "%s located at %p\n",
                 acpi_gbl_table_data[table_info->type].name, table_info->pointer));
 
+
+unlock_and_exit:
         (void) acpi_ut_release_mutex (ACPI_MTX_TABLES);
         return_ACPI_STATUS (status);
 }
@@ -251,6 +261,7 @@ acpi_tb_init_table_descriptor (
 {
         struct acpi_table_list          *list_head;
         struct acpi_table_desc          *table_desc;
+        acpi_status                     status;
 
 
         ACPI_FUNCTION_TRACE_U32 ("tb_init_table_descriptor", table_type);
@@ -263,6 +274,13 @@ acpi_tb_init_table_descriptor (
                 return_ACPI_STATUS (AE_NO_MEMORY);
         }
 
+        /* Get a new owner ID for the table */
+
+        status = acpi_ut_allocate_owner_id (&table_desc->owner_id);
+        if (ACPI_FAILURE (status)) {
+                return_ACPI_STATUS (status);
+        }
+
         /* Install the table into the global data structure */
 
         list_head = &acpi_gbl_table_lists[table_type];
@@ -325,8 +343,6 @@ acpi_tb_init_table_descriptor (
         table_desc->aml_start           = (u8 *) (table_desc->pointer + 1),
         table_desc->aml_length          = (u32) (table_desc->length -
                          (u32) sizeof (struct acpi_table_header));
-        table_desc->table_id            = acpi_ut_allocate_owner_id (
-                         ACPI_OWNER_TYPE_TABLE);
         table_desc->loaded_into_namespace = FALSE;
 
         /*
@@ -339,7 +355,7 @@ acpi_tb_init_table_descriptor (
 
         /* Return Data */
 
-        table_info->table_id        = table_desc->table_id;
+        table_info->owner_id        = table_desc->owner_id;
         table_info->installed_desc  = table_desc;
 
         return_ACPI_STATUS (AE_OK);