Commit a131c2bf authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'acpi-5.3-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull ACPI fix from Rafael Wysocki:
 "Revert a recent ACPICA commit causing systems to hang at boot time"

* tag 'acpi-5.3-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  Revert "ACPICA: Update table load object initialization"
parents 237f83df 6cf7fb5a
...@@ -174,9 +174,12 @@ acpi_ex_load_table_op(struct acpi_walk_state *walk_state, ...@@ -174,9 +174,12 @@ acpi_ex_load_table_op(struct acpi_walk_state *walk_state,
return_ACPI_STATUS(status); return_ACPI_STATUS(status);
} }
/* Complete the initialization/resolution of new objects */ /* Complete the initialization/resolution of package objects */
acpi_ns_initialize_objects(); status = acpi_ns_walk_namespace(ACPI_TYPE_PACKAGE, ACPI_ROOT_OBJECT,
ACPI_UINT32_MAX, 0,
acpi_ns_init_one_package, NULL, NULL,
NULL);
/* Parameter Data (optional) */ /* Parameter Data (optional) */
...@@ -434,11 +437,12 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc, ...@@ -434,11 +437,12 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
return_ACPI_STATUS(status); return_ACPI_STATUS(status);
} }
/* Complete the initialization/resolution of new objects */ /* Complete the initialization/resolution of package objects */
acpi_ex_exit_interpreter(); status = acpi_ns_walk_namespace(ACPI_TYPE_PACKAGE, ACPI_ROOT_OBJECT,
acpi_ns_initialize_objects(); ACPI_UINT32_MAX, 0,
acpi_ex_enter_interpreter(); acpi_ns_init_one_package, NULL, NULL,
NULL);
/* Store the ddb_handle into the Target operand */ /* Store the ddb_handle into the Target operand */
......
...@@ -297,11 +297,15 @@ acpi_status acpi_load_table(struct acpi_table_header *table) ...@@ -297,11 +297,15 @@ acpi_status acpi_load_table(struct acpi_table_header *table)
status = acpi_tb_install_and_load_table(ACPI_PTR_TO_PHYSADDR(table), status = acpi_tb_install_and_load_table(ACPI_PTR_TO_PHYSADDR(table),
ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL, ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL,
FALSE, &table_index); FALSE, &table_index);
if (ACPI_SUCCESS(status)) {
/* Complete the initialization/resolution of new objects */ if (ACPI_SUCCESS(status)) {
/* Complete the initialization/resolution of package objects */
acpi_ns_initialize_objects(); status = acpi_ns_walk_namespace(ACPI_TYPE_PACKAGE,
ACPI_ROOT_OBJECT,
ACPI_UINT32_MAX, 0,
acpi_ns_init_one_package,
NULL, NULL, NULL);
} }
return_ACPI_STATUS(status); return_ACPI_STATUS(status);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment