The previous patches introduces two new functions:
acpi_initialize_tables_firmware() and acpi_initialize_tables_override(),
which work just the same as acpi_initialize_tables() if they are called
in sequence.
In order to split acpi_table_init() on acpi side, call these two functions
in acpi_table_init().
Since acpi_table_init() is also used in ia64, we keep it works as before.
Signed-off-by: Tang Chen <tangchen@xxxxxxxxxxxxxx>
Reviewed-by: Zhang Yanfei <zhangyanfei@xxxxxxxxxxxxxx>
---
drivers/acpi/tables.c | 5 ++++-
include/acpi/acpixf.h | 4 ++++
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index d67a1fe..c8f2d01 100644
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -349,10 +349,13 @@ int __init acpi_table_init(void)
{
acpi_status status;
- status = acpi_initialize_tables(initial_tables, ACPI_MAX_TABLES, 0);
+ status = acpi_initialize_tables_firmware(initial_tables,
+ ACPI_MAX_TABLES, 0);
if (ACPI_FAILURE(status))
return 1;
+ acpi_initialize_tables_override();
+
check_multiple_madt();
return 0;
}
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index 22d497e..99c9d7b 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -115,6 +115,10 @@ extern u32 acpi_rsdt_forced;
* Initialization
*/
acpi_status
+acpi_initialize_tables_firmware(struct acpi_table_desc *initial_storage,
+ u32 initial_table_count, u8 allow_resize);
+void acpi_initialize_tables_override(void);
+acpi_status
acpi_initialize_tables(struct acpi_table_desc *initial_storage,
u32 initial_table_count, u8 allow_resize);
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
