Attachment 60131 Details for Bug 121839

[patch] Move checks under MUTEXes...

table-sync.patch (text/plain), 3.19 KB, created by Alexey Starikovskiy on 2005-12-08 19:07:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexey Starikovskiy

Created: 2005-12-08 19:07:18 UTC

Size: 3.19 KB

patch

obsolete

>diff --git a/drivers/acpi/namespace/nsload.c b/drivers/acpi/namespace/nsload.c
>--- a/drivers/acpi/namespace/nsload.c
>+++ b/drivers/acpi/namespace/nsload.c
>@@ -118,17 +118,26 @@ acpi_ns_load_table(struct acpi_table_des
> 	 */
> 	ACPI_DEBUG_PRINT((ACPI_DB_INFO,
> 			  "**** Loading table into namespace ****\n"));
>-
>+	
> 	status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
> 	if (ACPI_FAILURE(status)) {
> 		return_ACPI_STATUS(status);
> 	}
>+	
>+	/* If table already loaded into namespace, just return */
>+	if (table_desc->loaded_into_namespace) {
>+		status = AE_ALREADY_EXISTS;
>+		goto unlock_and_exit;
>+	}
> 
> 	status = acpi_ns_parse_table(table_desc, node->child);
>-	(void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
>+
>+	if (ACPI_SUCCESS(status)) {
>+		table_desc->loaded_into_namespace = TRUE;
>+	}
> 
> 	if (ACPI_FAILURE(status)) {
>-		return_ACPI_STATUS(status);
>+		goto unlock_and_exit;
> 	}
> 
> 	/*
>@@ -144,7 +153,8 @@ acpi_ns_load_table(struct acpi_table_des
> 
> 	ACPI_DEBUG_PRINT((ACPI_DB_INFO,
> 			  "**** Completed Table Method Parsing and Object Initialization ****\n"));
>-
>+unlock_and_exit:
>+	(void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
> 	return_ACPI_STATUS(status);
> }
> 
>@@ -186,18 +196,9 @@ static acpi_status acpi_ns_load_table_by
> 
> 		table_desc = acpi_gbl_table_lists[ACPI_TABLE_DSDT].next;
> 
>-		/* If table already loaded into namespace, just return */
>-
>-		if (table_desc->loaded_into_namespace) {
>-			goto unlock_and_exit;
>-		}
>-
> 		/* Now load the single DSDT */
> 
> 		status = acpi_ns_load_table(table_desc, acpi_gbl_root_node);
>-		if (ACPI_SUCCESS(status)) {
>-			table_desc->loaded_into_namespace = TRUE;
>-		}
> 		break;
> 
> 	case ACPI_TABLE_SSDT:
>@@ -212,22 +213,15 @@ static acpi_status acpi_ns_load_table_by
> 		 */
> 		table_desc = acpi_gbl_table_lists[table_type].next;
> 		for (i = 0; i < acpi_gbl_table_lists[table_type].count; i++) {
>-			/*
>-			 * Only attempt to load table into namespace if it is not
>-			 * already loaded!
>-			 */
>-			if (!table_desc->loaded_into_namespace) {
>-				status =
>-				    acpi_ns_load_table(table_desc,
>-						       acpi_gbl_root_node);
>-				if (ACPI_FAILURE(status)) {
>-					break;
>-				}
>-
>-				table_desc->loaded_into_namespace = TRUE;
>-			}
>-
>+			status = acpi_ns_load_table(table_desc,
>+							acpi_gbl_root_node);
> 			table_desc = table_desc->next;
>+			if (status == AE_ALREADY_EXISTS) {
>+				continue;
>+			}
>+			if (ACPI_FAILURE(status)) {
>+				break;
>+			}
> 		}
> 		break;
> 
>@@ -236,7 +230,6 @@ static acpi_status acpi_ns_load_table_by
> 		break;
> 	}
> 
>-      unlock_and_exit:
> 	(void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
> 	return_ACPI_STATUS(status);
> }
>diff --git a/drivers/acpi/tables/tbutils.c b/drivers/acpi/tables/tbutils.c
>--- a/drivers/acpi/tables/tbutils.c
>+++ b/drivers/acpi/tables/tbutils.c
>@@ -89,10 +89,8 @@ acpi_status acpi_tb_is_table_installed(s
> 		 * we don't check for duplicate tables during the initial installation
> 		 * of tables within the RSDT/XSDT.
> 		 */
>-		if ((table_desc->loaded_into_namespace) &&
>-		    (table_desc->pointer->length ==
>-		     new_table_desc->pointer->length)
>-		    &&
>+		if (table_desc->pointer->length ==
>+			new_table_desc->pointer->length &&
> 		    (!ACPI_MEMCMP
> 		     ((const char *)table_desc->pointer,
> 		      (const char *)new_table_desc->pointer,

Actions: View | Diff

Attachments on bug 121839: 52078 | 52079 | 52085 | 53635 | 53636 | 53803 | 53818 | 53820 | 53830 | 53831 | 53834 | 54402 | 54404 | 55985 | 56107 | 56550 | 56551 | 60131