xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ACPICA: Report error if method creates 2 objects with the same name

Browse Source 
Fixed a regression where an error was no
longer emitted if a control method attempts to create 2
objects of the same name. This previously and now returns
AE_ALREADY_EXISTS. When this exception occurs, it invokes
the mechanism that will dynamically serialize the control
method to possible prevent future errors. (BZ 440)

Signed-off-by: Alexey Starikovskiy <alexey.y.starikovskiy@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Bob Moore
2007-02-02 19:48:20 +03:00
committed by Len Brown
parent ea5d8ebcbb
commit 13b572a35e
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/acpi/dispatcher/dswload.c
View File

@@ -547,6 +547,7 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
acpi_status status; acpi_status status;
acpi_object_type object_type; acpi_object_type object_type;
char *buffer_ptr; char *buffer_ptr;
u32 flags;
ACPI_FUNCTION_TRACE(ds_load2_begin_op); ACPI_FUNCTION_TRACE(ds_load2_begin_op);
@@ -752,12 +753,20 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
break; break;
} }
/* Add new entry into namespace */ flags = ACPI_NS_NO_UPSEARCH;
if (walk_state->pass_number == 3) {
/* Execution mode, node cannot already exist */
flags |= ACPI_NS_ERROR_IF_FOUND;
}
/* Add new entry or lookup existing entry */
status = status =
acpi_ns_lookup(walk_state->scope_info, buffer_ptr, acpi_ns_lookup(walk_state->scope_info, buffer_ptr,
object_type, ACPI_IMODE_LOAD_PASS2, object_type, ACPI_IMODE_LOAD_PASS2, flags,
ACPI_NS_NO_UPSEARCH, walk_state, &(node)); walk_state, &node);
break; break;
} }

5
drivers/acpi/parser/psparse.c
View File

@@ -540,6 +540,11 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)
if ((status == AE_ALREADY_EXISTS) && if ((status == AE_ALREADY_EXISTS) &&
(!walk_state->method_desc->method.mutex)) { (!walk_state->method_desc->method.mutex)) {
ACPI_INFO((AE_INFO,
"Marking method %4.4s as Serialized",
walk_state->method_node->name.
ascii));
/* /*
* Method tried to create an object twice. The probable cause is * Method tried to create an object twice. The probable cause is
* that the method cannot handle reentrancy. * that the method cannot handle reentrancy.