mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 00:39:48 +00:00
Merge branch 'acpica-fixes'
* acpica-fixes: ACPICA: Namespace: Fix deadlock triggered by MLC support in dynamic table loading
This commit is contained in:
commit
2605b98109
2 changed files with 9 additions and 2 deletions
|
@ -108,7 +108,9 @@ acpi_ex_add_table(u32 table_index,
|
||||||
|
|
||||||
/* Add the table to the namespace */
|
/* Add the table to the namespace */
|
||||||
|
|
||||||
|
acpi_ex_exit_interpreter();
|
||||||
status = acpi_ns_load_table(table_index, parent_node);
|
status = acpi_ns_load_table(table_index, parent_node);
|
||||||
|
acpi_ex_enter_interpreter();
|
||||||
if (ACPI_FAILURE(status)) {
|
if (ACPI_FAILURE(status)) {
|
||||||
acpi_ut_remove_reference(obj_desc);
|
acpi_ut_remove_reference(obj_desc);
|
||||||
*ddb_handle = NULL;
|
*ddb_handle = NULL;
|
||||||
|
|
|
@ -47,6 +47,7 @@
|
||||||
#include "acparser.h"
|
#include "acparser.h"
|
||||||
#include "acdispat.h"
|
#include "acdispat.h"
|
||||||
#include "actables.h"
|
#include "actables.h"
|
||||||
|
#include "acinterp.h"
|
||||||
|
|
||||||
#define _COMPONENT ACPI_NAMESPACE
|
#define _COMPONENT ACPI_NAMESPACE
|
||||||
ACPI_MODULE_NAME("nsparse")
|
ACPI_MODULE_NAME("nsparse")
|
||||||
|
@ -170,6 +171,8 @@ acpi_ns_parse_table(u32 table_index, struct acpi_namespace_node *start_node)
|
||||||
|
|
||||||
ACPI_FUNCTION_TRACE(ns_parse_table);
|
ACPI_FUNCTION_TRACE(ns_parse_table);
|
||||||
|
|
||||||
|
acpi_ex_enter_interpreter();
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* AML Parse, pass 1
|
* AML Parse, pass 1
|
||||||
*
|
*
|
||||||
|
@ -185,7 +188,7 @@ acpi_ns_parse_table(u32 table_index, struct acpi_namespace_node *start_node)
|
||||||
status = acpi_ns_one_complete_parse(ACPI_IMODE_LOAD_PASS1,
|
status = acpi_ns_one_complete_parse(ACPI_IMODE_LOAD_PASS1,
|
||||||
table_index, start_node);
|
table_index, start_node);
|
||||||
if (ACPI_FAILURE(status)) {
|
if (ACPI_FAILURE(status)) {
|
||||||
return_ACPI_STATUS(status);
|
goto error_exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -201,8 +204,10 @@ acpi_ns_parse_table(u32 table_index, struct acpi_namespace_node *start_node)
|
||||||
status = acpi_ns_one_complete_parse(ACPI_IMODE_LOAD_PASS2,
|
status = acpi_ns_one_complete_parse(ACPI_IMODE_LOAD_PASS2,
|
||||||
table_index, start_node);
|
table_index, start_node);
|
||||||
if (ACPI_FAILURE(status)) {
|
if (ACPI_FAILURE(status)) {
|
||||||
return_ACPI_STATUS(status);
|
goto error_exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
error_exit:
|
||||||
|
acpi_ex_exit_interpreter();
|
||||||
return_ACPI_STATUS(status);
|
return_ACPI_STATUS(status);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue