summaryrefslogtreecommitdiff
path: root/drivers/acpi/acpica/tbutils.c
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2014-04-04 08:39:26 +0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-04-21 00:59:39 +0400
commited6f1d44dae8a4eec42a74acae95cc177ee2e1ad (patch)
tree03f219cabf69c5b92cab0f9f7e3c0dd495c951e2 /drivers/acpi/acpica/tbutils.c
parentcaf4a15c5f930aae41951b4916289e3e59dda8eb (diff)
downloadlinux-ed6f1d44dae8a4eec42a74acae95cc177ee2e1ad.tar.xz
ACPICA: Table Manager: Misc cleanup and renames, no functional change.
Some various cleanups and renames. Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/tbutils.c')
-rw-r--r--drivers/acpi/acpica/tbutils.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/drivers/acpi/acpica/tbutils.c b/drivers/acpi/acpica/tbutils.c
index aa11949815df..6c31d77cece0 100644
--- a/drivers/acpi/acpica/tbutils.c
+++ b/drivers/acpi/acpica/tbutils.c
@@ -179,10 +179,12 @@ struct acpi_table_header *acpi_tb_copy_dsdt(u32 table_index)
ACPI_MEMCPY(new_table, table_desc->pointer, table_desc->length);
acpi_tb_uninstall_table(table_desc);
- acpi_tb_install_table(&acpi_gbl_root_table_list.
- tables[ACPI_TABLE_INDEX_DSDT],
- ACPI_PTR_TO_PHYSADDR(new_table),
- ACPI_TABLE_ORIGIN_INTERN_VIRTUAL, new_table);
+
+ acpi_tb_init_table_descriptor(&acpi_gbl_root_table_list.
+ tables[ACPI_TABLE_INDEX_DSDT],
+ ACPI_PTR_TO_PHYSADDR(new_table),
+ ACPI_TABLE_ORIGIN_INTERNAL_VIRTUAL,
+ new_table);
ACPI_INFO((AE_INFO,
"Forced DSDT copy: length 0x%05X copied locally, original unmapped",
@@ -470,11 +472,11 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address)
/* Get the table physical address (32-bit for RSDT, 64-bit for XSDT) */
status =
- acpi_tb_install_non_fixed_table(acpi_tb_get_root_table_entry
- (table_entry,
- table_entry_size),
- ACPI_TABLE_ORIGIN_INTERN_PHYSICAL,
- FALSE, TRUE, &table_index);
+ acpi_tb_install_standard_table(acpi_tb_get_root_table_entry
+ (table_entry,
+ table_entry_size),
+ ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL,
+ FALSE, TRUE, &table_index);
if (ACPI_SUCCESS(status) &&
ACPI_COMPARE_NAME(&acpi_gbl_root_table_list.