diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-07-10 12:52:50 +0300 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-07-10 12:52:50 +0300 |
commit | 6cf7fb5a95dec9743f4bfd96f9ece580a355cdd1 (patch) | |
tree | 4e2e2f600452b28b7ee5e627e64b7f0331aeb49f /drivers/acpi/acpica/tbxfload.c | |
parent | 4b4704520d97b74e045154fc3b844b73ae4e7ebd (diff) | |
download | linux-6cf7fb5a95dec9743f4bfd96f9ece580a355cdd1.tar.xz |
Revert "ACPICA: Update table load object initialization"
Revert commit c522ad0637ca ("ACPICA: Update table load object
initialization") as it causes systems to hang on attempts to load
OEM ACPI tables.
Reported-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/tbxfload.c')
-rw-r--r-- | drivers/acpi/acpica/tbxfload.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/acpi/acpica/tbxfload.c b/drivers/acpi/acpica/tbxfload.c index 86f1693f6d29..ef8f8a9f3c9c 100644 --- a/drivers/acpi/acpica/tbxfload.c +++ b/drivers/acpi/acpica/tbxfload.c @@ -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), ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL, 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); |